diff --git a/guacamole/src/main/webapp/app/manage/controllers/manageConnectionController.js b/guacamole/src/main/webapp/app/manage/controllers/manageConnectionController.js
index 731950db3..04694f2dd 100644
--- a/guacamole/src/main/webapp/app/manage/controllers/manageConnectionController.js
+++ b/guacamole/src/main/webapp/app/manage/controllers/manageConnectionController.js
@@ -145,6 +145,15 @@ angular.module('manage').controller('manageConnectionController', ['$scope', '$i
      */
     $scope.permissions = null;
 
+    /**
+     * All available connection attributes. This is only the set of attribute
+     * definitions, organized as logical groupings of attributes, not attribute
+     * values.
+     *
+     * @type Form[]
+     */
+    $scope.attributes = null;
+
     /**
      * Returns whether critical data has completed being loaded.
      *
@@ -161,12 +170,18 @@ angular.module('manage').controller('manageConnectionController', ['$scope', '$i
             && $scope.historyDateFormat    !== null
             && $scope.historyEntryWrappers !== null
             && $scope.permissions          !== null
+            && $scope.attributes           !== null
             && $scope.canSaveConnection    !== null
             && $scope.canDeleteConnection  !== null
             && $scope.canCloneConnection   !== null;
 
     };
 
+    // Pull connection attribute schema
+    schemaService.getConnectionAttributes().success(function attributesReceived(attributes) {
+        $scope.attributes = attributes;
+    });
+
     // Pull connection group hierarchy
     connectionGroupService.getConnectionGroupTree(ConnectionGroup.ROOT_IDENTIFIER, 
         [PermissionSet.ObjectPermissionType.ADMINISTER])
diff --git a/guacamole/src/main/webapp/app/manage/controllers/manageConnectionGroupController.js b/guacamole/src/main/webapp/app/manage/controllers/manageConnectionGroupController.js
index 86580d047..02119c4d0 100644
--- a/guacamole/src/main/webapp/app/manage/controllers/manageConnectionGroupController.js
+++ b/guacamole/src/main/webapp/app/manage/controllers/manageConnectionGroupController.js
@@ -37,6 +37,7 @@ angular.module('manage').controller('manageConnectionGroupController', ['$scope'
     var connectionGroupService = $injector.get('connectionGroupService');
     var guacNotification       = $injector.get('guacNotification');
     var permissionService      = $injector.get('permissionService');
+    var schemaService          = $injector.get('schemaService');
     
     /**
      * An action to be provided along with the object sent to showStatus which
@@ -94,6 +95,15 @@ angular.module('manage').controller('manageConnectionGroupController', ['$scope'
      */
     $scope.permissions = null;
 
+    /**
+     * All available connection group attributes. This is only the set of
+     * attribute definitions, organized as logical groupings of attributes, not
+     * attribute values.
+     *
+     * @type Form[]
+     */
+    $scope.attributes = null;
+
     /**
      * Returns whether critical data has completed being loaded.
      *
@@ -106,11 +116,17 @@ angular.module('manage').controller('manageConnectionGroupController', ['$scope'
         return $scope.rootGroup                !== null
             && $scope.connectionGroup          !== null
             && $scope.permissions              !== null
+            && $scope.attributes               !== null
             && $scope.canSaveConnectionGroup   !== null
             && $scope.canDeleteConnectionGroup !== null;
 
     };
     
+    // Pull connection group attribute schema
+    schemaService.getConnectionGroupAttributes().success(function attributesReceived(attributes) {
+        $scope.attributes = attributes;
+    });
+
     // Query the user's permissions for the current connection group
     permissionService.getPermissions(authenticationService.getCurrentUserID())
             .success(function permissionsReceived(permissions) {
diff --git a/guacamole/src/main/webapp/app/manage/controllers/manageUserController.js b/guacamole/src/main/webapp/app/manage/controllers/manageUserController.js
index c8a641d79..e1e89e82c 100644
--- a/guacamole/src/main/webapp/app/manage/controllers/manageUserController.js
+++ b/guacamole/src/main/webapp/app/manage/controllers/manageUserController.js
@@ -37,9 +37,9 @@ angular.module('manage').controller('manageUserController', ['$scope', '$injecto
     var authenticationService  = $injector.get('authenticationService');
     var connectionGroupService = $injector.get('connectionGroupService');
     var guacNotification       = $injector.get('guacNotification');
-    var userService            = $injector.get('userService');
     var permissionService      = $injector.get('permissionService');
     var schemaService          = $injector.get('schemaService');
+    var userService            = $injector.get('userService');
 
     /**
      * An action to be provided along with the object sent to showStatus which
diff --git a/guacamole/src/main/webapp/app/manage/templates/manageConnection.html b/guacamole/src/main/webapp/app/manage/templates/manageConnection.html
index fabe59dcb..1ea45baa5 100644
--- a/guacamole/src/main/webapp/app/manage/templates/manageConnection.html
+++ b/guacamole/src/main/webapp/app/manage/templates/manageConnection.html
@@ -57,6 +57,11 @@ THE SOFTWARE.
         </table>
     </div>
 
+    <!-- Connection attributes section -->
+    <div class="attributes">
+        <guac-form namespace="'CONNECTION_ATTRIBUTES'" content="attributes" model="connection.attributes"></guac-form>
+    </div>
+
     <!-- Connection parameters -->
     <h2 class="header">{{'MANAGE_CONNECTION.SECTION_HEADER_PARAMETERS' | translate}}</h2>
     <div class="section connection-parameters" ng-class="{loading: !parameters}">
diff --git a/guacamole/src/main/webapp/app/manage/templates/manageConnectionGroup.html b/guacamole/src/main/webapp/app/manage/templates/manageConnectionGroup.html
index f1fb395df..370aa8a9b 100644
--- a/guacamole/src/main/webapp/app/manage/templates/manageConnectionGroup.html
+++ b/guacamole/src/main/webapp/app/manage/templates/manageConnectionGroup.html
@@ -57,6 +57,11 @@ THE SOFTWARE.
         </table>
     </div>
 
+    <!-- Connection group attributes section -->
+    <div class="attributes">
+        <guac-form namespace="'CONNECTION_GROUP_ATTRIBUTES'" content="attributes" model="connectionGroup.attributes"></guac-form>
+    </div>
+
     <!-- Form action buttons -->
     <div class="action-buttons">
         <button ng-show="canSaveConnectionGroup" ng-click="saveConnectionGroup()">{{'MANAGE_CONNECTION_GROUP.ACTION_SAVE' | translate}}</button>