diff --git a/src/freedombone b/src/freedombone
index d9451e36..bab5ae98 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -1389,6 +1389,10 @@ function install_cjdns_tools {
   echo 'install_cjdns_tools' >> $COMPLETION_FILE
 }
 
+function remove_instructions_from_motd {
+    sed -i '/## /d' /etc/motd
+}
+
 function check_hwrng {
   # If hardware random number generation was enabled then make sure that the device exists.
   # if /dev/hwrng is not found then any subsequent cryptographic key generation would
@@ -1873,7 +1877,7 @@ function create_backup_script {
   echo "    mkdir -p /root/backupemail" >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo "  tar -czvf /root/backupemail/maildir.tar.gz /home/$MY_USERNAME/Maildir" >> /usr/bin/$BACKUP_SCRIPT_NAME
-  echo '  echo "Backing up emails"' >> /usr/bin/$BACKUP_SCRIPT_NAME  
+  echo '  echo "Backing up emails"' >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo "  if [ ! -d $USB_MOUNT/backup/mail ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo "    mkdir -p $USB_MOUNT/backup/mail" >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
@@ -4230,6 +4234,12 @@ function configure_ssh {
   echo ''
   echo "  *** Reconnect via ssh on port $SSH_PORT, then run this script again  ***"
   echo ''
+  echo '## ' >> /etc/motd
+  echo '## Type "su" and enter your administrator password, then use the command:' >> /etc/motd
+  echo '## ' >> /etc/motd
+  echo '##   freedombone -c freedombone.cfg' >> /etc/motd
+  echo '## ' >> /etc/motd
+  echo '## to continue the installation.' >> /etc/motd
   reboot
 }
 
@@ -6589,10 +6599,10 @@ function install_wiki {
   chown www-data /var/lib/dokuwiki/custom
   chown www-data /var/lib/dokuwiki/custom/local.php
   chown -R www-data /etc/dokuwiki
-  chown -R www-data /usr/share/dokuwiki/lib/  
+  chown -R www-data /usr/share/dokuwiki/lib/
   chmod 600 /var/lib/dokuwiki/custom/local.php
   chmod -R 755 /usr/share/dokuwiki/lib
-  
+
   sed -i 's|//$conf|$conf|g' /var/lib/dokuwiki/custom/local.php
   sed -i "s|joe|$MY_USERNAME|g" /var/lib/dokuwiki/custom/local.php
 
@@ -8218,7 +8228,7 @@ function install_dynamicdns {
 
   # create an unprivileged user
   #useradd -r -s /bin/false debian-inadyn
-  
+
   # create a configuration file
   echo 'background' > /etc/inadyn.conf
   echo 'verbose        1' >> /etc/inadyn.conf
@@ -8502,6 +8512,7 @@ install_cjdns
 install_cjdns_tools
 backup_github_projects
 configure_ssh
+remove_instructions_from_motd
 check_hwrng
 search_for_attached_usb_drive
 regenerate_ssh_keys