diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connectiongroups/Create.java b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connectiongroups/Create.java
index 61fee7de7..3483576a4 100644
--- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connectiongroups/Create.java
+++ b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connectiongroups/Create.java
@@ -33,20 +33,15 @@ import net.sourceforge.guacamole.net.basic.AuthenticatingHttpServlet;
  */
 public class Create extends AuthenticatingHttpServlet {
 
-    /**
-     * Prefix given to a parameter name when that parameter is a protocol-
-     * specific parameter meant for the configuration.
-     */
-    public static final String PARAMETER_PREFIX = "_";
-
     @Override
     protected void authenticatedService(
             UserContext context,
             HttpServletRequest request, HttpServletResponse response)
     throws GuacamoleException {
 
-        // Get name
+        // Get name and type
         String name     = request.getParameter("name");
+        String type     = request.getParameter("type");
         
         // Get the ID of the parent connection group
         String parentID = request.getParameter("parentID");
@@ -61,6 +56,11 @@ public class Create extends AuthenticatingHttpServlet {
         // Create connection skeleton
         ConnectionGroup connectionGroup = new DummyConnectionGroup();
         connectionGroup.setName(name);
+        
+        if("balancing".equals(type))
+            connectionGroup.setType(ConnectionGroup.Type.BALANCING);
+        else if("organizational".equals(type))
+            connectionGroup.setType(ConnectionGroup.Type.ORGANIZATIONAL);
 
         // Add connection
         directory.add(connectionGroup);
diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connectiongroups/Update.java b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connectiongroups/Update.java
index 2e7aa794b..a9f708249 100644
--- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connectiongroups/Update.java
+++ b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connectiongroups/Update.java
@@ -33,21 +33,16 @@ import net.sourceforge.guacamole.net.basic.AuthenticatingHttpServlet;
  */
 public class Update extends AuthenticatingHttpServlet {
 
-    /**
-     * Prefix given to a parameter name when that parameter is a protocol-
-     * specific parameter meant for the configuration.
-     */
-    public static final String PARAMETER_PREFIX = "_";
-
     @Override
     protected void authenticatedService(
             UserContext context,
             HttpServletRequest request, HttpServletResponse response)
     throws GuacamoleException {
 
-        // Get ID, name, and protocol
+        // Get ID, name, and type
         String identifier = request.getParameter("id");
         String name       = request.getParameter("name");
+        String type       = request.getParameter("type");
 
         // Attempt to get connection group directory
         Directory<String, ConnectionGroup> directory =
@@ -56,6 +51,11 @@ public class Update extends AuthenticatingHttpServlet {
         // Create connection group skeleton
         ConnectionGroup connectionGroup = directory.get(identifier);
         connectionGroup.setName(name);
+        
+        if("balancing".equals(type))
+            connectionGroup.setType(ConnectionGroup.Type.BALANCING);
+        else if("organizational".equals(type))
+            connectionGroup.setType(ConnectionGroup.Type.ORGANIZATIONAL);
 
         // Update connection group
         directory.update(connectionGroup);