diff --git a/guacamole/src/main/webapp/scripts/admin-ui.js b/guacamole/src/main/webapp/scripts/admin-ui.js
index daf2b0d89..cf6327652 100644
--- a/guacamole/src/main/webapp/scripts/admin-ui.js
+++ b/guacamole/src/main/webapp/scripts/admin-ui.js
@@ -1072,8 +1072,11 @@ GuacAdmin.ConnectionGroupEditor = function(group, parameters) {
     bal_type.textContent = "Balancing";
     bal_type.value = "balancing";
 
-    // Default to organizational
-    type_field.value = "organizational";
+    // Read type from group
+    if (group.type === GuacamoleService.ConnectionGroup.Type.ORGANIZATIONAL)
+        type_field.value = "organizational";
+    else if (group.type === GuacamoleService.ConnectionGroup.Type.BALANCING)
+        type_field.value = "balancing";
 
     // Add save button
     var save_button = GuacUI.createChildElement(dialog.getFooter(), "button");