diff --git a/mail.sh b/mail.sh
index fe5084b..835081f 100644
--- a/mail.sh
+++ b/mail.sh
@@ -1076,8 +1076,6 @@ echo -e '\n\n\e[1;32mOpenssl certificates have successfully been generated!\e[0m
 rm ${0}
 dhparam
 
-echo -e '\n\e[1m\t## Run "~/dhparam" upon logging in\n\e[0m'
-
 echo -e "\e[1;32mInstaller has completed, login at https://${subdomain}.${domain} to access your new email."
 echo -e "Reboot is recommended...\e[0m\n"
 sudo rm ${0}
@@ -1099,13 +1097,14 @@ CHANGEUSER
 while :
 do
     clear
-    if ping -q -c 1 -W 3 ${domain} >/dev/null
+    if ssh ${username}@${domain} -p ${ssh_port} exit
     then
-        sleep 1
+        echo -e '\e[1m## Run "~/dhparam" upon logging in\n\e[0m'
         ssh ${username}@${domain} -p ${ssh_port}
         break
+    else
+        sleep 1
     fi
-    sleep 1
 done\n"
 
     . ~/.bashrc