diff --git a/src/freedombone b/src/freedombone
index 4bf177d3..edcd0484 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -3286,17 +3286,19 @@ function create_restore_script {
   echo '  for d in /home/*/ ; do' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '    USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '    if [[ $USERNAME != "git" ]]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
-  echo '      echo "Restoring spamassassin settings for $USERNAME"' >> /usr/bin/$RESTORE_SCRIPT_NAME
-  echo '      restore_directory_from_usb /root/tempspamassassin spamassassin/$USERNAME' >> /usr/bin/$RESTORE_SCRIPT_NAME
-  echo -n "      cp -rf /root/tempspamassassin/${RESTORE_SUBDIR}" >> /usr/bin/$RESTORE_SCRIPT_NAME
+  echo '      if [ -d $USB_MOUNT/backup/spamassassin/$USERNAME ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
+  echo '        echo "Restoring spamassassin settings for $USERNAME"' >> /usr/bin/$RESTORE_SCRIPT_NAME
+  echo '        restore_directory_from_usb /root/tempspamassassin spamassassin/$USERNAME' >> /usr/bin/$RESTORE_SCRIPT_NAME
+  echo -n "        cp -rf /root/tempspamassassin/${RESTORE_SUBDIR}" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '$USERNAME/.spamassassin /home/$USERNAME/' >> /usr/bin/$RESTORE_SCRIPT_NAME
-  echo '      if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
-  echo '        umount $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
-  echo '        rm -rf $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
+  echo '        if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
+  echo '          umount $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
+  echo '          rm -rf $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
+  echo '          rm -rf /root/tempspamassassin' >> /usr/bin/$RESTORE_SCRIPT_NAME
+  echo '          exit 276' >> /usr/bin/$RESTORE_SCRIPT_NAME
+  echo '        fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '        rm -rf /root/tempspamassassin' >> /usr/bin/$RESTORE_SCRIPT_NAME
-  echo '        exit 276' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '      fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
-  echo '      rm -rf /root/tempspamassassin' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '    fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  done' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME