diff --git a/CHANGELOG b/CHANGELOG
index 9318adf45e..bc87018e88 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -37,6 +37,8 @@ Changes
 
 Date       Dev Ver     Change details
 ---------- --- ------  --------------
+2013-05-17 DP  1.16.2  Don't prompt the user for a password if they're using
+                       a client certificate.
 2013-05-17 DP  1.16.2  Ensure global backups use the mintenance database to 
                        avoid access issue with postgres or template1.
 2013-05-17 DP  1.16.2  Fix SSL certificate authentication.
diff --git a/pgadmin/schema/pgServer.cpp b/pgadmin/schema/pgServer.cpp
index 27e7f48842..906d7ec18c 100644
--- a/pgadmin/schema/pgServer.cpp
+++ b/pgadmin/schema/pgServer.cpp
@@ -626,7 +626,7 @@ int pgServer::Connect(frmMain *form, bool askPassword, const wxString &pwd, bool
 		}
 		if (askPassword)
 		{
-			if (!passwordValid || !GetPasswordIsStored() || !GetStorePwd())
+			if ((!passwordValid || !GetPasswordIsStored() || !GetStorePwd()) && GetSSLCert() == wxEmptyString)
 			{
 				wxString txt;
 				txt.Printf(_("Please enter password for user %s\non server %s (%s)"), username.c_str(), description.c_str(), GetName().c_str());