diff --git a/lib/functions.sh b/lib/functions.sh
index 6dcd735..d5eddcf 100644
--- a/lib/functions.sh
+++ b/lib/functions.sh
@@ -1358,10 +1358,12 @@ get_installedapps() {
 }
 get_appvars() {
   LDAP_SECRET=`cat /federated/apps/ldap/.ldap.secret`
-  ADMINPASS=`cat /federated/apps/panel/.env | grep SMTP_PASSWORD | awk -F= '{ print $2 }'`
   EXTERNALIP=$(get_externalip);
   MYSQL_ROOTPASSWORD=`cat /federated/apps/pdnsmysql/.env | grep MYSQL_ROOT_PASSWORD | awk -F= '{ print $2 }'`
 
+  # If ADMINPASS doesn't exist in /etc/federated then use nextcloud to get it.  Otherwise get it from /etc/federated
+  [[ ! $(grep ADMINPASS /etc/federated | awk -F\" '{ print $2 }') ]] && ADMINPASS=$(cat /federated/apps/nextcloud/.nextcloud.secret) || ADMINPASS=$(grep ADMINPASS /etc/federated | awk -F\" '{ print $2 }')
+
   # If COTURN_MATRIX_SECRET exists in turnserver.conf then use it, otherwise create the password
   [[ $(grep static-auth-secret /federated/apps/coturn/data/etc/turnserver.conf 2>/dev/null | awk -F= '{ print $2 }') ]] && COTURN_MATRIX_SECRET=$(grep static-auth-secret /federated/apps/coturn/data/etc/turnserver.conf 2>/dev/null | awk -F= '{ print $2 }') || COTURN_MATRIX_SECRET=$(create_password);