diff --git a/nextcloud-startup-script.sh b/nextcloud-startup-script.sh
index d1700470..5d658716 100644
--- a/nextcloud-startup-script.sh
+++ b/nextcloud-startup-script.sh
@@ -405,16 +405,6 @@ read -p "Press any key to start the script..." -n1 -s
 clear
 echo -e "\e[0m"
 
-# Set keyboard layout
-echo "Current keyboard layout is $(localectl status | grep "Layout" | awk '{print $3}')"
-echo "You must change keyboard layout to your language"
-echo -e "\e[32m"
-read -p "Press any key to change keyboard layout... " -n1 -s
-echo -e "\e[0m"
-dpkg-reconfigure keyboard-configuration
-echo
-clear
-
 # Set hostname and ServerName
 echo "Setting hostname..."
 FQN=$(host -TtA $(hostname -s)|grep "has address"|awk '{print $1}') ; \
@@ -472,7 +462,7 @@ then
     sleep 1
     echo
     CONTEST=$(bash $SCRIPTS/test_connection.sh)
-    if [ "$CONTEST" == "Connected!" ] 
+    if [ "$CONTEST" == "Connected!" ]
     then
         # Connected!
         echo -e "\e[32mConnected!\e[0m"
@@ -508,6 +498,16 @@ else
 fi
 clear
 
+# Set keyboard layout
+echo "Current keyboard layout is $(localectl status | grep "Layout" | awk '{print $3}')"
+echo "You must change keyboard layout to your language"
+echo -e "\e[32m"
+read -p "Press any key to change keyboard layout... " -n1 -s
+echo -e "\e[0m"
+dpkg-reconfigure keyboard-configuration
+echo
+clear
+
 # Pretty URLs
 echo "Setting RewriteBase to "/" in config.php..."
 chown -R www-data:www-data $NCPATH