diff --git a/bin/yunoprompt b/bin/yunoprompt
index 8062ab06e..3ab510d2a 100755
--- a/bin/yunoprompt
+++ b/bin/yunoprompt
@@ -56,7 +56,7 @@ EOF
 
 echo "$LOGO_AND_FINGERPRINTS" > /etc/issue
 
-if [[ ! -f /etc/yunohost/installed ]]
+if ! groups | grep -q all_users && [[ ! -f /etc/yunohost/installed ]]
 then
     chvt 2