diff --git a/guacamole/src/main/webapp/app/client/controllers/clientController.js b/guacamole/src/main/webapp/app/client/controllers/clientController.js
index 9674306c8..f392746d7 100644
--- a/guacamole/src/main/webapp/app/client/controllers/clientController.js
+++ b/guacamole/src/main/webapp/app/client/controllers/clientController.js
@@ -78,13 +78,13 @@ angular.module('home').controller('clientController', ['$scope', '$routeParams',
     $scope.clientProperties = new ClientProperties();
     
     // Hide menu by default
-    $scope.menuShown        = false;
+    $scope.menuShown = false;
     
     // Convenience method for closing the menu
     $scope.closeMenu = function closeMenu() {
         $scope.menuShown = false;
     };
-    
+
     // Update the model when clipboard data received from client
     $scope.$on('guacClientClipboard', function clipboardDataReceived(clipboardData) {
        $scope.guacClipboard = clipboardData; 
@@ -99,19 +99,19 @@ angular.module('home').controller('clientController', ['$scope', '$routeParams',
     $scope.connectionParameters = $routeParams.params || '';
 
     // Pull connection name from server
-    switch ($scope.type) {
+    switch ($routeParams.type) {
 
         // Connection
         case 'c':
-            connectionDAO.getConnection($scope.id).success(function (connection) {
-                $scope.page.title = connection.name;
+            connectionDAO.getConnection($routeParams.id).success(function (connection) {
+                $scope.connectionName = $scope.page.title = connection.name;
             });
             break;
 
         // Connection group
         case 'g':
-            connectionGroupDAO.getConnectionGroup($scope.id).success(function (group) {
-                $scope.page.title = group.name;
+            connectionGroupDAO.getConnectionGroup($routeParams.id).success(function (group) {
+                $scope.connectionName = $scope.page.title = group.name;
             });
             break;
 
diff --git a/guacamole/src/main/webapp/app/client/directives/guacClient.js b/guacamole/src/main/webapp/app/client/directives/guacClient.js
index 0449905b2..5ca0850d9 100644
--- a/guacamole/src/main/webapp/app/client/directives/guacClient.js
+++ b/guacamole/src/main/webapp/app/client/directives/guacClient.js
@@ -35,7 +35,6 @@ angular.module('client').directive('guacClient', [function guacClient() {
             
             // Parameters for initially connecting
             id                      : '=',
-            connectionName          : '=', 
             connectionParameters    : '='
         },
         templateUrl: 'app/client/templates/guacClient.html',
diff --git a/guacamole/src/main/webapp/app/client/templates/client.html b/guacamole/src/main/webapp/app/client/templates/client.html
index dfa3e773f..ce58b74de 100644
--- a/guacamole/src/main/webapp/app/client/templates/client.html
+++ b/guacamole/src/main/webapp/app/client/templates/client.html
@@ -26,7 +26,6 @@
     <guac-client 
         client-properties="clientProperties"
         id="id"
-        connection-name="connectionName"
         connection-parameters="connectionParameters"
     ></guac-client>