diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index 2588bbfea..5acc96e23 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cc
@@ -630,6 +630,8 @@ void LockProcess::startSecureDialog()
 		return;
 	}
 
+	setGeometry(0, 0, mRootWidth, mRootHeight);
+
 	int ret;
 	SecureDlg inDlg( this );
 	inDlg.setRetInt(&ret);
diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc
index 2711c36c5..c0b8e2480 100644
--- a/kdesktop/lock/main.cc
+++ b/kdesktop/lock/main.cc
@@ -181,14 +181,14 @@ int main( int argc, char **argv )
             rt = process.runSecureDialog();
         }
         else {
-            return 1;
+            return 0;
         }
     }
     else {
         rt = process.defaultSave();
     }
     if (!rt) {
-        return 1;
+        return 0;
     }
 
     if( sig )
diff --git a/kdesktop/lockeng.cc b/kdesktop/lockeng.cc
index fb0f75447..5307c5c5e 100644
--- a/kdesktop/lockeng.cc
+++ b/kdesktop/lockeng.cc
@@ -372,6 +372,7 @@ printf("Lock process exited\n\r"); fflush(stdout);
     }
     if (mTerminationRequested == true) {
         abnormalExit = false;
+        mTerminationRequested = false;
     }
     if (abnormalExit == true) {
         // PROBABLE HACKING ATTEMPT DETECTED