diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index 0da852d98..283b09d25 100644
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -22,6 +22,7 @@ Fixes:
 #971: Portable Settings now apply to any machine they are used on
 #961: Connections file overwritten if correct decryption password not provided
 #893: Removed unneeded files from build/package
+#868: if statement returned the same value
 #762: Increased button size to fit locaized text
 
 
diff --git a/mRemoteV1/UI/Forms/PasswordForm.cs b/mRemoteV1/UI/Forms/PasswordForm.cs
index eee2902e1..1ecc251b3 100644
--- a/mRemoteV1/UI/Forms/PasswordForm.cs
+++ b/mRemoteV1/UI/Forms/PasswordForm.cs
@@ -55,12 +55,12 @@ namespace mRemoteNG.UI.Forms
 		}
 
 	    private void btnOK_Click(object sender, EventArgs e)
-		{
-			if (Verify && VerifyPassword())
-				DialogResult = DialogResult.OK;
-			else
-				DialogResult = DialogResult.OK;
-		}
+	    {
+	        if (Verify && VerifyPassword())
+	            DialogResult = DialogResult.OK;
+	        else
+	            DialogResult = DialogResult.None;
+	    }
 
 	    private void txtPassword_TextChanged(object sender, EventArgs e)
 		{