diff --git a/nextcloud-startup-script.sh b/nextcloud-startup-script.sh
index 93bf464a..4d32d84b 100644
--- a/nextcloud-startup-script.sh
+++ b/nextcloud-startup-script.sh
@@ -310,6 +310,16 @@ else
 fi
 clear
 
+# Set keyboard layout
+echo "Current keyboard layout is Swedish"
+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
+
 # Change Timezone
 echo "Current timezone is Europe/Stockholm"
 echo "You must change timezone to your timezone"
diff --git a/nextcloud_install_production.sh b/nextcloud_install_production.sh
index 346681cb..d4c3b658 100644
--- a/nextcloud_install_production.sh
+++ b/nextcloud_install_production.sh
@@ -126,16 +126,6 @@ then
     exit 1
 fi
 
-# Set keyboard layout
-echo "Current keyboard layout is Swedish"
-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
-
 # Create $UNIXUSER if not existing
 if id "$UNIXUSER" >/dev/null 2>&1
 then