diff --git a/guacamole/src/main/webapp/client.xhtml b/guacamole/src/main/webapp/client.xhtml
index 9178053f4..7dcd85c58 100644
--- a/guacamole/src/main/webapp/client.xhtml
+++ b/guacamole/src/main/webapp/client.xhtml
@@ -219,7 +219,7 @@
             // Disconnect on close
             window.onunload = function() {
                 guac.disconnect();
-            }
+            };
 
             // Handle clipboard events
             var clipboardElement = document.getElementById("clipboard");
@@ -325,9 +325,7 @@
             try {
 
                 // Get ID
-                var url = window.location.href;
-                var query = url.indexOf("?");
-                var id = url.substring(query+1);
+                var id = window.location.search.substring(1);
 
                 // Connect client
                 guac.connect("id=" + id);