diff --git a/guacamole/src/main/webapp/app/client/templates/connection.html b/guacamole/src/main/webapp/app/client/templates/connection.html
index f6c1e700a..7ddc72bfa 100644
--- a/guacamole/src/main/webapp/app/client/templates/connection.html
+++ b/guacamole/src/main/webapp/app/client/templates/connection.html
@@ -1,4 +1,4 @@
-<a class="connection" ng-href="#/client/{{ item.getClientIdentifier() }}">
+<a class="connection" ng-href="{{ item.getClientURL() }}">
     <div class="icon type" ng-class="item.protocol"></div>
     <span class="name">{{item.name}}</span>
 </a>
diff --git a/guacamole/src/main/webapp/app/client/templates/connectionGroup.html b/guacamole/src/main/webapp/app/client/templates/connectionGroup.html
index b2ea62c49..680491c3b 100644
--- a/guacamole/src/main/webapp/app/client/templates/connectionGroup.html
+++ b/guacamole/src/main/webapp/app/client/templates/connectionGroup.html
@@ -1,4 +1,4 @@
-<span class="connection-group name">
-    <a ng-show="item.balancing" ng-href="#/client/{{ item.getClientIdentifier() }}">{{item.name}}</a>
-    <span ng-show="!item.balancing">{{item.name}}</span>
-</span>
+<a class="connection-group" ng-href="{{ item.getClientURL() }}">
+    <div ng-show="item.balancing" class="icon type balancer"></div>
+    <span class="name">{{item.name}}</span>
+</a>