diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index d1121a706..dbe0da500 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cc
@@ -580,6 +580,7 @@ bool LockProcess::defaultSave()
             TQTimer::singleShot(mLockGrace, this, TQT_SLOT(startLock()));
         return true;
     }
+    mOverrideHackStartupEnabled = false;
     return false;
 }
 
@@ -709,6 +710,7 @@ bool LockProcess::runSecureDialog()
 		return true;
 	}
 	else {
+		mInSecureDialog = false;
 		return false;
 	}
 }