diff --git a/bin/yunoprompt b/bin/yunoprompt
index 252e5a1a4..645dd4ab1 100755
--- a/bin/yunoprompt
+++ b/bin/yunoprompt
@@ -6,7 +6,7 @@ x509_fingerprint=$(openssl x509  -in /etc/yunohost/certs/yunohost.org/crt.pem -n
 
 # Fetch SSH fingerprints
 i=0
-for key in $(ls /etc/ssh/ssh_host_{ed25519,rsa,ecdsa}_key.pub 2> /dev/null) ; do 
+for key in $(ls /etc/ssh/ssh_host_{ed25519,rsa,ecdsa}_key.pub 2> /dev/null) ; do
     output=$(ssh-keygen -l -f $key)
     fingerprint[$i]=" - $(echo $output | cut -d' ' -f2) $(echo $output| cut -d' ' -f4)"
     i=$(($i + 1))
@@ -43,22 +43,21 @@ LOGO_AND_FINGERPRINTS=$(cat << EOF
 
 $LOGO
 
- IP: ${local_ip}
- X509 fingerprint: ${x509_fingerprint}
+ Local IP: ${local_ip:-(no ip detected?)}
+ Local SSL CA X509 fingerprint:
+   ${x509_fingerprint}
  SSH fingerprints:
  ${fingerprint[0]}
  ${fingerprint[1]}
  ${fingerprint[2]}
- ${fingerprint[3]}
- ${fingerprint[4]}
 
 EOF
 )
 
-if [[ -f /etc/yunohost/installed ]]
+echo "$LOGO_AND_FINGERPRINTS" > /etc/issue
+
+if [[ ! -f /etc/yunohost/installed ]]
 then
-    echo "$LOGO_AND_FINGERPRINTS" > /etc/issue
-else
     chvt 2
 
     # Formatting
diff --git a/data/other/yunoprompt.service b/data/other/yunoprompt.service
index 3c4df50f9..effb69590 100644
--- a/data/other/yunoprompt.service
+++ b/data/other/yunoprompt.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=YunoHost boot prompt
 After=getty@tty2.service
+After=network.target
 
 [Service]
 Type=simple