diff --git a/src/freedombone b/src/freedombone
index 640f4f7c..e24ed481 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -5166,6 +5166,12 @@ function change_login_message {
   if grep -Fxq "change_login_message" $COMPLETION_FILE; then
       return
   fi
+
+  # remove automatic motd creator if it exists
+  if [ -f /etc/init.d/motd ]; then
+      rm -f /etc/init.d/motd
+  fi
+
   echo '' > /etc/motd
   echo ".---.                  .              .                   " >> /etc/motd
   echo "|                      |              |                   " >> /etc/motd
diff --git a/src/freedombone-prep b/src/freedombone-prep
index a1e999d3..2e3a2d9f 100755
--- a/src/freedombone-prep
+++ b/src/freedombone-prep
@@ -251,6 +251,11 @@ if [ ! -f $MICROSD_MOUNT_POINT/$ROOTFS/usr/local/bin/freedombone ]; then
     exit 8736
 fi
 
+# remove automatic motd creator if it exists
+if [ -f $MICROSD_MOUNT_POINT/$ROOTFS/etc/init.d/motd ]; then
+    $SUDO rm -f $MICROSD_MOUNT_POINT/$ROOTFS/etc/init.d/motd
+fi
+
 # change the motd to show further install instructions
 echo '' >> /tmp/freedombone_motd
 echo 'Create a user for the system with:' >> /tmp/freedombone_motd