diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index 0a7f86366..5dbc4d152 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cc
@@ -596,6 +596,7 @@ bool LockProcess::defaultSave()
 		}
 		return true;
 	}
+	mOverrideHackStartupEnabled = false;
 	return false;
 }
 
@@ -725,6 +726,7 @@ bool LockProcess::runSecureDialog()
 		return true;
 	}
 	else {
+		mInSecureDialog = false;
 		return false;
 	}
 }