diff --git a/home.admin/_provision.setup.sh b/home.admin/_provision.setup.sh
index 3b5f2813..7a39dc82 100755
--- a/home.admin/_provision.setup.sh
+++ b/home.admin/_provision.setup.sh
@@ -275,7 +275,7 @@ if [ "${lightning}" == "lnd" ]; then
 
     echo "WALLET --> SEED + SCB " >> ${logFile}
     sudo sed -i "s/^message=.*/message='LND Wallet (SEED & SCB)'/g" ${infoFile}    
-    sudo /home/admin/config.scripts/lnd.initwallet.py mainnet scb ${passwordC} "${seedWords}" "${staticchannelbackup}" ${seedPassword}
+    sudo /home/admin/config.scripts/lnd.initwallet.py scb mainnet ${passwordC} "${seedWords}" "${staticchannelbackup}" ${seedPassword}
     if [ "${err}" != "" ]; then
       sed -i "s/^state=.*/state=error/g" ${infoFile}
       sed -i "s/^message=.*/message='setup: lnd wallet SCB failed'/g" ${infoFile}
@@ -291,7 +291,7 @@ if [ "${lightning}" == "lnd" ]; then
     
     echo "WALLET --> SEED" >> ${logFile}
     sudo sed -i "s/^message=.*/message='LND Wallet (SEED)'/g" ${infoFile}    
-    sudo /home/admin/config.scripts/lnd.initwallet.py mainnet seed ${passwordC} "${seedWords}" ${seedPassword}
+    sudo /home/admin/config.scripts/lnd.initwallet.py seed mainnet ${passwordC} "${seedWords}" ${seedPassword}
     if [ "${err}" != "" ]; then
       sed -i "s/^state=.*/state=error/g" ${infoFile}
       sed -i "s/^message=.*/message='setup: lnd wallet SEED failed'/g" ${infoFile}
@@ -307,7 +307,7 @@ if [ "${lightning}" == "lnd" ]; then
 
     echo "WALLET --> NEW" >> ${logFile}
     sudo sed -i "s/^message=.*/message='LND Wallet (NEW)'/g" ${infoFile}    
-    source <(sudo /home/admin/config.scripts/lnd.initwallet.py mainnet new ${passwordC})
+    source <(sudo /home/admin/config.scripts/lnd.initwallet.py new mainnet ${passwordC})
     if [ "${err}" != "" ]; then
       sed -i "s/^state=.*/state=error/g" ${infoFile}
       sed -i "s/^message=.*/message='setup: lnd wallet SEED failed'/g" ${infoFile}
diff --git a/home.admin/_provision_.sh b/home.admin/_provision_.sh
index a76f7333..4a1202ed 100755
--- a/home.admin/_provision_.sh
+++ b/home.admin/_provision_.sh
@@ -786,7 +786,7 @@ if [ "${lightning}" == "lnd" ];then
   if [ "${passwordFlagExists}" == "1" ]; then
     echo "Found /mnt/hdd/passwordc.flag .. changing password" >> ${logFile}
     oldPasswordC=$(sudo cat /mnt/hdd/passwordc.flag)
-    sudo /home/admin/config.scripts/lnd.initwallet.py mainnet change-password "${oldPasswordC}" "${passwordC}" >> ${logFile}
+    sudo /home/admin/config.scripts/lnd.initwallet.py change-password mainnet "${oldPasswordC}" "${passwordC}" >> ${logFile}
     sudo shred -u /mnt/hdd/passwordc.flag    
   else
     echo "No /mnt/hdd/passwordc.flag" >> ${logFile}
diff --git a/home.admin/config.scripts/blitz.setpassword.sh b/home.admin/config.scripts/blitz.setpassword.sh
index 177e2d59..be01fd98 100755
--- a/home.admin/config.scripts/blitz.setpassword.sh
+++ b/home.admin/config.scripts/blitz.setpassword.sh
@@ -365,7 +365,7 @@ elif [ "${abcd}" = "c" ]; then
   sleep 2
 
   err=""
-  source <(sudo /home/admin/config.scripts/lnd.initwallet.py mainnet change-password $oldPassword $newPassword)
+  source <(sudo /home/admin/config.scripts/lnd.initwallet.py change-password mainnet $oldPassword $newPassword)
   if [ "${err}" != "" ]; then
     dialog --backtitle "RaspiBlitz - Setup" --msgbox "FAIL -> Was not able to change password\n\n${err}\n${errMore}" 10 52
     clear
diff --git a/home.admin/config.scripts/lnd.install.sh b/home.admin/config.scripts/lnd.install.sh
index a993460e..6301b3a9 100644
--- a/home.admin/config.scripts/lnd.install.sh
+++ b/home.admin/config.scripts/lnd.install.sh
@@ -172,12 +172,13 @@ alias ${netprefix}lncli=\"sudo -u bitcoin /usr/local/bin/lncli\
       else
         passwordC="raspiblitz"
       fi
-      source <(sudo /home/admin/config.scripts/lnd.initwallet.py mainnet new ${passwordC})
+      source <(sudo /home/admin/config.scripts/lnd.initwallet.py new mainnet ${passwordC})
       if [ "${err}" != "" ]; then
         clear
         echo "# !!! LND mainnet wallet creation failed"
         echo "# ${err}"
-        sleep 6
+        echo "# press ENTER to continue"
+        read key
       else
         seedFile="/mnt/hdd/lnd/data/chain/${network}/${CHAIN}/seedwords.info"
         echo "seedwords='${seedwords}'" > ${seedFile}