diff --git a/src/freedombone-sec b/src/freedombone-sec
index 9bd7033e..2c3e8392 100755
--- a/src/freedombone-sec
+++ b/src/freedombone-sec
@@ -377,11 +377,14 @@ function regenerate_dh_keys {
 }
 
 function reset_tripwire {
-  if [[ $RESET_TRIPWIRE == "yes" ]]; then
-      echo '
+  if [[ $RESET_TRIPWIRE != "yes" ]]; then
+      return
+  fi
+  clear
+  echo '
 
 ' | reset-tripwire
-  fi
+  exit 0
 }
 
 function housekeeping {
@@ -408,6 +411,7 @@ function housekeeping {
         ;;
     esac
   done
+  reset_tripwire
 }
 
 function import_settings {
@@ -639,5 +643,4 @@ change_ssh_settings
 change_xmpp_settings
 regenerate_ssh_host_keys
 regenerate_dh_keys
-reset_tripwire
 exit 0