diff --git a/guacamole/src/main/webapp/app/manage/controllers/connectionEditModalController.js b/guacamole/src/main/webapp/app/manage/controllers/connectionEditModalController.js
index fd943217c..568450257 100644
--- a/guacamole/src/main/webapp/app/manage/controllers/connectionEditModalController.js
+++ b/guacamole/src/main/webapp/app/manage/controllers/connectionEditModalController.js
@@ -36,7 +36,6 @@ angular.module('manage').controller('connectionEditModalController', ['$scope',
     
     // Copy data into a new conection object in case the user doesn't want to save
     $scope.connection = new Connection($scope.connection);
-    $scope.connection.parameters = {};
     
     var newConnection = !$scope.connection.identifier;
     
@@ -60,6 +59,9 @@ angular.module('manage').controller('connectionEditModalController', ['$scope',
         });
 
     }
+    else {
+        $scope.connection.parameters = {};
+    }
     
     /**
      * Close the modal.
diff --git a/guacamole/src/main/webapp/app/manage/templates/editableConnection.html b/guacamole/src/main/webapp/app/manage/templates/editableConnection.html
index 213b33c02..06c5e3a50 100644
--- a/guacamole/src/main/webapp/app/manage/templates/editableConnection.html
+++ b/guacamole/src/main/webapp/app/manage/templates/editableConnection.html
@@ -65,14 +65,17 @@ THE SOFTWARE.
               </table>
             </dd>
 
-            <dd>
+            <!-- Connection parameters -->
+            <dt>{{'manage.edit.connection.parameters' | translate}}</dt>
+
+            <dd ng-class="{loading: !connection.parameters}">
               <table class="fields section">
                   
                 <!-- All the different possible editable field types -->
                 <tr ng-repeat="parameter in protocols[connection.protocol].parameters">
                   <th>{{'protocol.' + connection.protocol + '.parameters.' + parameter.name + '.label' | translate}}:</th>
                   <td>
-                      <guac-connection-parameter protocol="protocols[connection.protocol]" name="parameter.name" value="connection.parameters[parameter.name]" />
+                      <guac-connection-parameter protocol="protocols[connection.protocol]" name="parameter.name" parameters="connection.parameters"/>
                   </td>
                 </tr>
               </table>
diff --git a/guacamole/src/main/webapp/translations/en_US.json b/guacamole/src/main/webapp/translations/en_US.json
index 16d282093..2d8a236d3 100644
--- a/guacamole/src/main/webapp/translations/en_US.json
+++ b/guacamole/src/main/webapp/translations/en_US.json
@@ -46,6 +46,7 @@
                 "root"              : "ROOT",
                 "location"          : "Location:",
                 "name"              : "Name:",
+                "parameters"        : "Parameters:",
                 "history"           : {
                     "connectionNotUsed" : "This connection has not yet been used.",
                     "usageHistory"      : "Usage History:",