diff --git a/bin/lamassu-update b/bin/lamassu-update
index c00cb90c..4025122d 100755
--- a/bin/lamassu-update
+++ b/bin/lamassu-update
@@ -43,7 +43,7 @@ decho "unlinking ${NPM_BIN}/lamassu* old executables"
 find ${NPM_BIN} -type l \( -name "lamassu-*" -or -name "hkdf" \) -exec rm -fv {} \; >> ${LOG_FILE} 2>&1
 
 if [ -d "/usr/lib/node_modules/lamassu-server" ]; then
-    BKP_NAME = lamassu-server-$(date +%s)
+    BKP_NAME=lamassu-server-$(date +%s)
     decho "renaming old lamassu-server instance to ${BKP_NAME}"
     mv -v "/usr/lib/node_modules/lamassu-server" "/usr/lib/node_modules/${BKP_NAME}" >> ${LOG_FILE} 2>&1
 fi
diff --git a/lamassu-default.json b/lamassu-default.json
index 2397d8d8..f8400b72 100644
--- a/lamassu-default.json
+++ b/lamassu-default.json
@@ -1,6 +1,5 @@
 {
   "seedPath": "/etc/lamassu/seeds/seed.txt",
-  "mnemonicPath": "/etc/lamassu/mnemonics/mnemonic.txt",
   "caPath": "/etc/ssl/certs/Lamassu_OP_Root_CA.pem",
   "certPath": "/etc/ssl/certs/Lamassu_OP.pem",
   "keyPath": "/etc/ssl/private/Lamassu_OP.key",
diff --git a/lamassu-remote-install/install b/lamassu-remote-install/install
index 5b90d219..ba29bfb2 100755
--- a/lamassu-remote-install/install
+++ b/lamassu-remote-install/install
@@ -92,12 +92,6 @@ apt update >> $LOG_FILE 2>&1
 decho "Installing necessary packages..."
 apt install nodejs python-minimal build-essential supervisor postgresql libpq-dev -y -q >> $LOG_FILE 2>&1
 
-decho "Generating mnemonic..."
-mkdir -p $MNEMONIC_DIR >> $LOG_FILE 2>&1
-SEED=$(openssl rand -hex 32)
-MNEMONIC=$(bip39 $SEED)
-echo "$MNEMONIC" > $MNEMONIC_FILE
-
 decho "Installing latest npm package manager for node..."
 retry 3 npm -g --unsafe-perm install npm@5  >> $LOG_FILE 2>&1
 NODE_MODULES=$(npm -g root)
@@ -106,6 +100,12 @@ NPM_BIN=$(npm -g bin)
 decho "Installing lamassu-server..."
 retry 3 npm -g --unsafe-perm install lamassu/lamassu-server#${1-master} >> $LOG_FILE 2>&1
 
+decho "Generating mnemonic..."
+mkdir -p $MNEMONIC_DIR >> $LOG_FILE 2>&1
+SEED=$(openssl rand -hex 32)
+MNEMONIC=$(bip39 $SEED)
+echo "$MNEMONIC" > $MNEMONIC_FILE
+
 decho "Creating postgres user..."
 POSTGRES_PW=$(hkdf postgres-pw $SEED)
 su -l postgres >> $LOG_FILE 2>&1 <<EOF
diff --git a/package.json b/package.json
index 761f32de..02674811 100644
--- a/package.json
+++ b/package.json
@@ -74,6 +74,7 @@
     "lamassu-admin-server": "./bin/lamassu-admin-server",
     "lamassu-apply-defaults": "./bin/lamassu-apply-defaults",
     "hkdf": "./bin/hkdf",
+    "bip39": "./bin/bip39",
     "lamassu-backup-pg": "./bin/lamassu-backup-pg",
     "lamassu-mnemonic": "./bin/lamassu-mnemonic",
     "lamassu-cancel": "./bin/lamassu-cancel",