diff --git a/CHANGELOG b/CHANGELOG
index 8fbf8603c7..a3d71d1927 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -36,6 +36,9 @@ Changes
 
 Date       Dev Ver     Change details
 ---------- --- ------  --------------
+2010-04-22 DP  1.10.3  Don't offer debugging options to non-superusers on 
+                       Postgres Plus Advanced Server < 8.4 which doesn't 
+                       have support for user debugging [Ashesh Vashi]
 2010-04-21 GL  1.10.3  Fix the saving and reverse engineering of parameters for
                        database, table, and function, according to a report
                        from Erwin Brandstetter.
diff --git a/pgadmin/debugger/debugger.cpp b/pgadmin/debugger/debugger.cpp
index 6b55dd87f9..7258f9819e 100644
--- a/pgadmin/debugger/debugger.cpp
+++ b/pgadmin/debugger/debugger.cpp
@@ -114,6 +114,10 @@ bool debuggerFactory::CheckEnable(pgObject *obj)
     if (!obj->GetServer() || !(obj->GetServer()->GetSuperUser() || obj->GetServer()->GetUsername() == obj->GetOwner()))
         return false;
 
+    // EnterpriseDB 8.3 or earlier does not support debugging by the non-superuser
+    if (!obj->GetServer()->GetSuperUser() && !obj->GetConnection()->EdbMinimumVersion(8, 4))
+        return false;
+
     if (!obj->IsCollection())
     {
         switch (obj->GetMetaType())