diff --git a/CHANGELOG b/CHANGELOG
index 6a823af1c..91cd31c36 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,7 @@
 On the road to 2023.03
 Highlights:
 - linux 6.2.x
-- added system wide locales: en_US,de_DE,fr_FR,es_ES,pt_PT,ru_RU
+- added system wide locales: en_US, de_DE, fr_FR, es_ES, pt_PT, ru_RU
 Environment changes:
 - implemented emergency shell with messages and with big font detection support
 - implemented new zram routine for all boot types
diff --git a/usr/lib/archboot/login.sh b/usr/lib/archboot/login.sh
index 7a2580c38..3c1e4189d 100644
--- a/usr/lib/archboot/login.sh
+++ b/usr/lib/archboot/login.sh
@@ -62,8 +62,12 @@ _enter_shell() {
     [[ -z $TTY ]] && TTY=$(tty)
     # dbus sources profiles again
     if ! echo "${TTY}" | grep -q pts; then
+        if ! [[ -e /tmp/.locale ]]; then
+            echo -e "Hit \e[1m\e[92mENTER\e[m for \e[1mfirst\e[m login setup."
+        else
+            echo -e "Hit \e[1m\e[92mENTER\e[m for \e[1mshell\e[m login."
+        fi
         cd /
-        echo -e "Hit \e[1m\e[92mENTER\e[m for \e[1mshell\e[m login."
         read -r
         clear
     fi
@@ -153,17 +157,14 @@ else
 fi
 
 if [[ -e /usr/bin/setup ]]; then
+    _local_mode
+    _enter_shell
     if ! [[ -e /tmp/.locale ]]; then
-        echo -e "Hit \e[1m\e[92mENTER\e[m for \e[1mfirst\e[m login setup."
-        read -r
         if ! [[ -e /tmp/.locale ]]; then
             archboot-locale.sh
-            cat /etc/motd
             source /etc/locale.conf
         fi
     fi
-    _local_mode
-    _enter_shell
     if ! [[ -e /tmp/.setup ]]; then
         setup
     fi