diff --git a/nextcloud-startup-script.sh b/nextcloud-startup-script.sh
index 349612fd..a5e82efe 100644
--- a/nextcloud-startup-script.sh
+++ b/nextcloud-startup-script.sh
@@ -2,11 +2,9 @@
 # shellcheck disable=2034,2059
 true
 # shellcheck source=lib.sh
-NCDB=1 && MYCNFPW=1 && FIRST_IFACE=1 && CHECK_CURRENT_REPO=1 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
+FIRST_IFACE=1 && CHECK_CURRENT_REPO=1 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 unset FIRST_IFACE
 unset CHECK_CURRENT_REPO
-unset MYCNFPW
-unset NCDB
 
 # Tech and Me © - 2017, https://www.techandme.se/
 
diff --git a/nextcloud_install_production.sh b/nextcloud_install_production.sh
index ea2b274d..cc433c32 100644
--- a/nextcloud_install_production.sh
+++ b/nextcloud_install_production.sh
@@ -8,9 +8,10 @@ sed -i "s|#precedence ::ffff:0:0/96  100|precedence ::ffff:0:0/96  100|g" /etc/g
 # shellcheck disable=2034,2059
 true
 # shellcheck source=lib.sh
-FIRST_IFACE=1 && CHECK_CURRENT_REPO=1 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
+NCDB=1 && FIRST_IFACE=1 && CHECK_CURRENT_REPO=1 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 unset FIRST_IFACE
 unset CHECK_CURRENT_REPO
+unset NCDB
 
 # Check for errors + debug code and abort if something isn't right
 # 1 = ON