diff --git a/create_database.sh b/create_database.sh
index 747ed2e..fb693af 100755
--- a/create_database.sh
+++ b/create_database.sh
@@ -435,22 +435,19 @@ if ! $NON_INTERACTIVE_MODE ; then
       echo "Insert Database user who will grant full access to database '${DATABASE_NAME}'.."
       echo ""
       echo ""
+
       if [ -z "$DATABASE_USER" ]; then
-         echononl "Database user for database '${DATABASE_NAME}': "
-         read DATABASE_USER
-         while [ "X$DATABASE_USER" = "X" ] ; do
-            echo -e "\n\t\033[33m\033[1mEingabe erforderlich.\033[m\n"
-            echononl "Database user for database '${DATABASE_NAME}': "
-            read DATABASE_USER
-         done
+         _DATABASE_USER="$DATABASE_NAME"
       else
          _DATABASE_USER="$DATABASE_USER"
-         echononl "Database user for database '${DATABASE_NAME}' [${_DATABASE_USER}]: "
-         read DATABASE_USER
-         if [[ "X$DATABASE_USER" = "X" ]]; then
-            DATABASE_USER=$_DATABASE_USER
-         fi
       fi
+
+      echononl "Database user for database '${DATABASE_NAME}' [${_DATABASE_USER}]: "
+      read DATABASE_USER
+      if [[ "X$DATABASE_USER" = "X" ]]; then
+         DATABASE_USER=$_DATABASE_USER
+      fi
+
    fi
 
    if $DATABASE_PASSWD_NEEDED ; then