Index: dlgDomain.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgDomain.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -Lsrc/ui/dlgDomain.cpp -Lsrc/ui/dlgDomain.cpp -u -w -r1.23 -r1.24
--- src/ui/dlgDomain.cpp
+++ src/ui/dlgDomain.cpp
@@ -61,21 +61,6 @@
 
 int dlgDomain::Go(bool modal)
 {
-    if (!domain)
-        cbOwner->Append(wxT(""));
-
-    pgSet *set=connection->ExecuteSet(wxT("SELECT usename FROM pg_user ORDER BY usename"));
-
-    if (set)
-    {
-        while (!set->Eof())
-        {
-            cbOwner->Append(set->GetVal(0));
-            set->MoveNext();
-        }
-        delete set;
-    }
-
     if (domain)
     {
         // edit mode
Index: dlgTablespace.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgTablespace.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lsrc/ui/dlgTablespace.cpp -Lsrc/ui/dlgTablespace.cpp -u -w -r1.4 -r1.5
--- src/ui/dlgTablespace.cpp
+++ src/ui/dlgTablespace.cpp
@@ -52,6 +52,8 @@
 
 int dlgTablespace::Go(bool modal)
 {
+    if (!tablespace)
+        cbOwner->Append(wxEmptyString);
     AddGroups();
     AddUsers(cbOwner);
     txtComment->Disable();
Index: dlgProperty.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgProperty.cpp,v
retrieving revision 1.88
retrieving revision 1.89
diff -Lsrc/ui/dlgProperty.cpp -Lsrc/ui/dlgProperty.cpp -u -w -r1.88 -r1.89
--- src/ui/dlgProperty.cpp
+++ src/ui/dlgProperty.cpp
@@ -226,8 +226,11 @@
     wxComboBox *cbowner = cbOwner;
 
     if (cbowner && !cbowner->GetCount())
+    {
+        if (!GetObject())
+            cbOwner->Append(wxEmptyString);
         AddUsers(cbowner);
-
+    }
     if (txtOid)
         txtOid->Disable();
 
Index: dlgAggregate.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgAggregate.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -Lsrc/ui/dlgAggregate.cpp -Lsrc/ui/dlgAggregate.cpp -u -w -r1.17 -r1.18
--- src/ui/dlgAggregate.cpp
+++ src/ui/dlgAggregate.cpp
@@ -59,8 +59,6 @@
 
 int dlgAggregate::Go(bool modal)
 {
-    AddUsers(cbOwner);
-
     if (!connection->BackendMinimumVersion(7, 5))
         cbOwner->Disable();
 
Index: dlgConversion.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgConversion.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -Lsrc/ui/dlgConversion.cpp -Lsrc/ui/dlgConversion.cpp -u -w -r1.15 -r1.16
--- src/ui/dlgConversion.cpp
+++ src/ui/dlgConversion.cpp
@@ -57,8 +57,6 @@
 
 int dlgConversion::Go(bool modal)
 {
-    AddUsers(cbOwner);
-
     if (!connection->BackendMinimumVersion(7, 4))
         txtComment->Disable();
 
Index: dlgFunction.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgFunction.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -Lsrc/ui/dlgFunction.cpp -Lsrc/ui/dlgFunction.cpp -u -w -r1.38 -r1.39
--- src/ui/dlgFunction.cpp
+++ src/ui/dlgFunction.cpp
@@ -103,6 +103,8 @@
 
 int dlgFunction::Go(bool modal)
 {
+    if (!function)
+        cbOwner->Append(wxEmptyString);
     AddGroups();
     AddUsers(cbOwner);