Index: dlgProperty.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgProperty.cpp,v
retrieving revision 1.91
retrieving revision 1.92
diff -Lsrc/ui/dlgProperty.cpp -Lsrc/ui/dlgProperty.cpp -u -w -r1.91 -r1.92
--- src/ui/dlgProperty.cpp
+++ src/ui/dlgProperty.cpp
@@ -577,8 +577,10 @@
 
     if (!sql.IsEmpty())
         if (!apply(sql))
+        {
+            EnableOK(true);
             return;
-
+        }
     Destroy();
 }
 
Index: dlgRule.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgRule.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -Lsrc/ui/dlgRule.cpp -Lsrc/ui/dlgRule.cpp -u -w -r1.11 -r1.12
--- src/ui/dlgRule.cpp
+++ src/ui/dlgRule.cpp
@@ -135,7 +135,7 @@
     wxString name=GetName();
     if (rule)
     {
-        EnableOK(didChange() || txtComment->GetValue() != rule->GetComment());
+        EnableOK(didChange() || txtSqlBox->GetText() != oldDefinition || txtComment->GetValue() != rule->GetComment());
     }
     else
     {
Index: dlgServer.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgServer.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lsrc/ui/dlgServer.cpp -Lsrc/ui/dlgServer.cpp -u -w -r1.3 -r1.4
--- src/ui/dlgServer.cpp
+++ src/ui/dlgServer.cpp
@@ -45,6 +45,7 @@
     EVT_TEXT(XRCID("txtDatabase"),                  dlgProperty::OnChange)
     EVT_TEXT(XRCID("txtPort")  ,                    dlgProperty::OnChange)
     EVT_TEXT(XRCID("txtUsername"),                  dlgProperty::OnChange)
+    EVT_COMBOBOX(XRCID("cbSSL"),                    dlgProperty::OnChange)
     EVT_CHECKBOX(XRCID("chkNeedPwd"),               dlgServer::OnChangeNeedPwd)
     EVT_BUTTON(XRCID("btnOK"),                      dlgServer::OnOK)
 END_EVENT_TABLE();