diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionDirectory.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionDirectory.java
index c769530ef..d599ca405 100644
--- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionDirectory.java
+++ b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionDirectory.java
@@ -329,7 +329,8 @@ public class ConnectionDirectory implements Directory<String, Connection>{
 
         // Verify that no connection already exists with this name.
         MySQLConnection previousConnection =
-                connectionService.retrieveConnection(mySQLConnection.getName(), parentID, user_id);
+                connectionService.retrieveConnection(mySQLConnection.getName(), 
+                toConnectionGroupID, user_id);
         if(previousConnection != null)
             throw new GuacamoleClientException("That connection name is already in use.");
         
diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionGroupDirectory.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionGroupDirectory.java
index 2c3144142..67d288922 100644
--- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionGroupDirectory.java
+++ b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionGroupDirectory.java
@@ -48,7 +48,6 @@ import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionGroupPermissionMap
 import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionGroupPermissionKey;
 import net.sourceforge.guacamole.net.auth.mysql.service.ConnectionGroupService;
 import net.sourceforge.guacamole.net.auth.mysql.service.PermissionCheckService;
-import net.sourceforge.guacamole.net.auth.permission.ObjectPermission;
 import org.mybatis.guice.transactional.Transactional;
 
 /**
@@ -279,7 +278,8 @@ public class ConnectionGroupDirectory implements Directory<String, ConnectionGro
 
         // Verify that no connection already exists with this name.
         MySQLConnectionGroup previousConnectionGroup =
-                connectionGroupService.retrieveConnectionGroup(mySQLConnectionGroup.getName(), parentID, user_id);
+                connectionGroupService.retrieveConnectionGroup(mySQLConnectionGroup.getName(), 
+                toConnectionGroupID, user_id);
         if(previousConnectionGroup != null)
             throw new GuacamoleClientException("That connection group name is already in use.");