diff --git a/guacamole/src/main/webapp/app/navigation/services/userPageService.js b/guacamole/src/main/webapp/app/navigation/services/userPageService.js
index e9239d796..daefb4707 100644
--- a/guacamole/src/main/webapp/app/navigation/services/userPageService.js
+++ b/guacamole/src/main/webapp/app/navigation/services/userPageService.js
@@ -91,7 +91,7 @@ angular.module('navigation').factory('userPageService', ['$injector',
             if (connection) {
                 return new PageDefinition(
                     connection.name,
-                    '/client/c/' + connection.identifier
+                    '/client/c/' + encodeURIComponent(connection.identifier)
                 );
             }
 
@@ -102,7 +102,7 @@ angular.module('navigation').factory('userPageService', ['$injector',
                     && _.isEmpty(connectionGroup.childConnectionGroups)) {
                 return new PageDefinition(
                     connectionGroup.name,
-                    '/client/g/' + connectionGroup.identifier
+                    '/client/g/' + encodeURIComponent(connectionGroup.identifier)
                 );
             }