diff --git a/build/run/bin/add-user b/build/run/bin/add-user
index 52a95ec..cca809e 100755
--- a/build/run/bin/add-user
+++ b/build/run/bin/add-user
@@ -62,8 +62,8 @@ then
         then
             echo -e '\n\n\e[1;31mPassword field cannot be empty, try again\e[0m'
         elif [ "${MYVEMAIL_MAIL_PASS}" != "${MYVEMAIL_MAIL_PASS2}" ]
-            echo -e '\n\n\e[1;31mPasswords did not match, try again\e[0m'
         then
+            echo -e '\n\n\e[1;31mPasswords did not match, try again\e[0m'
         fi
     done
     echo -e '\n\n\e[1;32mMail password has been saved\e[0m\n'
diff --git a/generate-env.sh b/generate-env.sh
index f8db568..f8cebf5 100755
--- a/generate-env.sh
+++ b/generate-env.sh
@@ -5,13 +5,13 @@ cat >./.env <<- gen-env
 MYVEMAIL_SUBDOMAIN=${SUBDOMAIN}
 MYVEMAIL_DOMAIN=${DOMAIN}
 
-# Optional
-# Version: edge or stable
-MYVEMAIL_VERSION=edge
-
 # Webmail port
 MYVEMAIL_PORT=${PORT}
 
+# Optional
+# Version: edge or stable (defaults to edge)
+MYVEMAIL_VERSION=
+
 # Additional mail domains separated by commas
 MYVEMAIL_ADDMX=