diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/User.java b/projects/cadcAccessControl/src/ca/nrc/cadc/ac/User.java
index 308552eff8fab1b0d9a9e560c3e073d22a5b16e2..b7ad0bcc44ef8c9da5156bd1c74ee320c3f07150 100644
--- a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/User.java
+++ b/projects/cadcAccessControl/src/ca/nrc/cadc/ac/User.java
@@ -74,6 +74,8 @@ import java.util.Set;
 
 import ca.nrc.cadc.auth.AuthenticationUtil;
 
+import javax.security.auth.x500.X500Principal;
+
 
 public class User<T extends Principal>
 {
@@ -133,7 +135,18 @@ public class User<T extends Principal>
             return false;
         }
         User other = (User) obj;
-        return AuthenticationUtil.equals(userID, other.userID);
+        if (userID instanceof X500Principal)
+        {
+            return AuthenticationUtil.equals(userID, other.userID);
+        }
+        else
+        {
+            if (!userID.equals(other.userID))
+            {
+                return false;
+            }
+            return true;
+        }
     }
 
     @Override
diff --git a/projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/GroupReaderWriterTest.java b/projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/GroupReaderWriterTest.java
index 7eca59935ea0a15bf378bcb0c4f20f9b64100e7c..c54f6ee56d0787551e5c3fb7c45a1fad85b67523 100644
--- a/projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/GroupReaderWriterTest.java
+++ b/projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/GroupReaderWriterTest.java
@@ -174,8 +174,6 @@ public class GroupReaderWriterTest
         StringBuilder xml = new StringBuilder();
         GroupWriter.write(expected, xml);
         assertFalse(xml.toString().isEmpty());
-
-        System.out.println(xml.toString());
         
         Group actual = GroupReader.read(xml.toString());
         assertNotNull(actual);