diff --git a/src/deb/for-download/tools/install-new-roundcube.sh b/src/deb/for-download/tools/install-new-roundcube.sh
index 8996fa756..4d03160e0 100644
--- a/src/deb/for-download/tools/install-new-roundcube.sh
+++ b/src/deb/for-download/tools/install-new-roundcube.sh
@@ -10,7 +10,6 @@ LOGINMESSAGE1='Click here for NEW Webmail'
 LOGINMESSAGE2='(it is adapted for mobile phones too)'
 
 DATABASE_NAME_WITHOUT_PREFIX="roundcube"
-DATABASE_NAME="${USER}_roundcube"
 
 #############################################################################################################################
 
@@ -21,6 +20,8 @@ if [ $# -gt 1 ]; then
     DOMAIN=$2
 fi
 
+DATABASE_NAME="${USER}_roundcube"
+
 if [ -z "$USER" ] || [ -z "$DOMAIN" ]; then
     echo "Usage:"
     echo "bash install-new-roundcube.sh VESTAUSER YOURDOMAIN.com"