diff --git a/src/freedombone-app-dokuwiki b/src/freedombone-app-dokuwiki
index d1f2f3a6a7e3f701b49ca9b7c465dda045b00ed8..97a2d14f9b0c8f771e759c868316f7ae5594844f 100755
--- a/src/freedombone-app-dokuwiki
+++ b/src/freedombone-app-dokuwiki
@@ -279,10 +279,10 @@ function install_dokuwiki {
 
     function_check get_dokuwiki_admin_password
     get_dokuwiki_admin_password
-    if [ ! $DOKUWIKI_ADMIN_PASSWORD ]; then
-        if [ -f $IMAGE_PASSWORD_FILE ]; then
-            DOKUWIKI_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
-        else
+    if [ -f $IMAGE_PASSWORD_FILE ]; then
+        DOKUWIKI_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
+    else
+        if [ ! $DOKUWIKI_ADMIN_PASSWORD ]; then
             DOKUWIKI_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
         fi
     fi
diff --git a/src/freedombone-app-ghost b/src/freedombone-app-ghost
index 43a7b118b8ca3fea5b627dc800bb9132d2524741..d05bff74bfeb7cfc0125ca8ac6184dab664aff52 100755
--- a/src/freedombone-app-ghost
+++ b/src/freedombone-app-ghost
@@ -288,10 +288,10 @@ function ghost_create_database {
     function_check get_mariadb_git_admin_password
     get_mariadb_git_admin_password
 
-    if [ ! ${GIT_ADMIN_PASSWORD} ]; then
-        if [ -f ${IMAGE_PASSWORD_FILE} ]; then
-            GIT_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
-        else
+    if [ -f ${IMAGE_PASSWORD_FILE} ]; then
+        GIT_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
+    else
+        if [ ! ${GIT_ADMIN_PASSWORD} ]; then
             GIT_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
         fi
     fi
diff --git a/src/freedombone-app-gnusocial b/src/freedombone-app-gnusocial
index cb2fb3d3cddb09426bc2421e147f018d7d93e042..0e5ee4b2d7eceae7bcc21fe16ddaaa1b8612b08f 100755
--- a/src/freedombone-app-gnusocial
+++ b/src/freedombone-app-gnusocial
@@ -202,10 +202,10 @@ function get_mariadb_gnusocial_admin_password {
 function gnusocial_create_database {
     function_check get_mariadb_gnusocial_admin_password
     get_mariadb_gnusocial_admin_password
-    if [ ! $GNUSOCIAL_ADMIN_PASSWORD ]; then
-        if [ -f $IMAGE_PASSWORD_FILE ]; then
-            GNUSOCIAL_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
-        else
+    if [ -f $IMAGE_PASSWORD_FILE ]; then
+        GNUSOCIAL_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
+    else
+        if [ ! $GNUSOCIAL_ADMIN_PASSWORD ]; then
             GNUSOCIAL_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
         fi
     fi
diff --git a/src/freedombone-app-gogs b/src/freedombone-app-gogs
index 73587bcac04eba59ad12fb0fc6ef6d4b063a9dfb..8a7a8b04b0102f5edd30e3f1ce5823921c0f0034 100755
--- a/src/freedombone-app-gogs
+++ b/src/freedombone-app-gogs
@@ -127,10 +127,10 @@ function gogs_create_database {
     function_check get_mariadb_git_admin_password
     get_mariadb_git_admin_password
 
-    if [ ! ${GIT_ADMIN_PASSWORD} ]; then
-        if [ -f ${IMAGE_PASSWORD_FILE} ]; then
-            GIT_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
-        else
+    if [ -f ${IMAGE_PASSWORD_FILE} ]; then
+        GIT_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
+    else
+        if [ ! ${GIT_ADMIN_PASSWORD} ]; then
             GIT_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
         fi
     fi
diff --git a/src/freedombone-app-htmly b/src/freedombone-app-htmly
index 3f62547f552ec6d3e843aaf4bcf5d69e17e2aefe..9a2753cb3fc83eee574bd77cbd1f30832c571f6a 100755
--- a/src/freedombone-app-htmly
+++ b/src/freedombone-app-htmly
@@ -388,20 +388,14 @@ function install_htmly_user {
     # create a user password
     function_check get_htmly_admin_password
     get_htmly_admin_password
+    if [ -f $IMAGE_PASSWORD_FILE ]; then
+        HTMLY_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
+    fi
     if [ ! $HTMLY_ADMIN_PASSWORD ]; then
-        if [ -f $IMAGE_PASSWORD_FILE ]; then
-            HTMLY_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
-        else
-            HTMLY_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
-        fi
-        echo '' >> /home/$MY_USERNAME/README
-        echo '' >> /home/$MY_USERNAME/README
+        HTMLY_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
         echo $'# htmly' >> /home/$MY_USERNAME/README
         echo $"Your htmly username: $MY_USERNAME" >> /home/$MY_USERNAME/README
         echo $"Your htmly password is: $HTMLY_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README
-        if [[ $ONION_ONLY == 'no' ]]; then
-            echo $"Log into your htmly at https://$HTMLY_DOMAIN_NAME/login" >> /home/$MY_USERNAME/README
-        fi
         chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
         chmod 600 /home/$MY_USERNAME/README
     fi
diff --git a/src/freedombone-app-hubzilla b/src/freedombone-app-hubzilla
index 7d16c0d3111039260085d880ba58ac7298607eac..4ce50ea4d7e769ddfa8907a0f293791764e54714 100755
--- a/src/freedombone-app-hubzilla
+++ b/src/freedombone-app-hubzilla
@@ -180,12 +180,11 @@ function get_mariadb_hubzilla_admin_password {
 function hubzilla_create_database {
     function_check get_mariadb_hubzilla_admin_password
     get_mariadb_hubzilla_admin_password
+    if [ -f $IMAGE_PASSWORD_FILE ]; then
+        HUBZILLA_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
+    fi
     if [ ! $HUBZILLA_ADMIN_PASSWORD ]; then
-        if [ -f $IMAGE_PASSWORD_FILE ]; then
-            HUBZILLA_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
-        else
-            HUBZILLA_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
-        fi
+        HUBZILLA_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
         if ! grep "# Hubzilla" /home/$MY_USERNAME/README; then
             echo '' >> /home/$MY_USERNAME/README
             echo '' >> /home/$MY_USERNAME/README
diff --git a/src/freedombone-app-lychee b/src/freedombone-app-lychee
index 4689576385848c627545e459cf8f310a654ef3c9..9d8defdfa2594ead344a6273d25f82d85b3e8228 100755
--- a/src/freedombone-app-lychee
+++ b/src/freedombone-app-lychee
@@ -60,10 +60,10 @@ function lychee_create_database {
     function_check get_mariadb_git_admin_password
     get_mariadb_git_admin_password
 
-    if [ ! ${GIT_ADMIN_PASSWORD} ]; then
-        if [ -f ${IMAGE_PASSWORD_FILE} ]; then
-            GIT_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
-        else
+    if [ -f ${IMAGE_PASSWORD_FILE} ]; then
+        GIT_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
+    else
+        if [ ! ${GIT_ADMIN_PASSWORD} ]; then
             GIT_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
         fi
     fi
diff --git a/src/freedombone-app-postactiv b/src/freedombone-app-postactiv
index 6bd9ba038f46a9470d5154f55ef56bb50f87228d..0459d1fabdec89e856e82c397462b40247f947c0 100755
--- a/src/freedombone-app-postactiv
+++ b/src/freedombone-app-postactiv
@@ -159,10 +159,10 @@ function get_mariadb_postactiv_admin_password {
 function postactiv_create_database {
     function_check get_mariadb_postactiv_admin_password
     get_mariadb_postactiv_admin_password
-    if [ ! $POSTACTIV_ADMIN_PASSWORD ]; then
-        if [ -f $IMAGE_PASSWORD_FILE ]; then
-            POSTACTIV_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
-        else
+    if [ -f $IMAGE_PASSWORD_FILE ]; then
+        POSTACTIV_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
+    else
+        if [ ! $POSTACTIV_ADMIN_PASSWORD ]; then
             POSTACTIV_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
         fi
     fi
diff --git a/src/freedombone-app-rss b/src/freedombone-app-rss
index 7a44c1292948772ffa091cf3d2ec641dce1f5173..c603cf4f87f4d2dc5f0a362588a00e09f8cd5a2f 100755
--- a/src/freedombone-app-rss
+++ b/src/freedombone-app-rss
@@ -74,10 +74,10 @@ function get_mariadb_rss_admin_password {
 function rss_create_database {
     function_check get_mariadb_rss_admin_password
     get_mariadb_rss_admin_password
-    if [ ! $RSS_READER_ADMIN_PASSWORD ]; then
-        if [ -f $IMAGE_PASSWORD_FILE ]; then
-            RSS_READER_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
-        else
+    if [ -f $IMAGE_PASSWORD_FILE ]; then
+        RSS_READER_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
+    else
+        if [ ! $RSS_READER_ADMIN_PASSWORD ]; then
             RSS_READER_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
         fi
     fi