diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/PermissionCheckService.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/PermissionCheckService.java
index 9379389d4..6144ca88a 100644
--- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/PermissionCheckService.java
+++ b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/PermissionCheckService.java
@@ -333,6 +333,11 @@ public class PermissionCheckService {
         if(checkSystemAdministratorAccess(userID))
             return true;
         
+        // A connection group administrator can use the group either way.
+        if(checkConnectionGroupAccess(userID, connectionGroupID,
+                MySQLConstants.CONNECTION_GROUP_ADMINISTER))
+            return true;
+        
         // Query the connection group
         MySQLConnectionGroup connectionGroup = connectionGroupService.
                 retrieveConnectionGroup(connectionGroupID, userID);