diff --git a/guacamole/src/main/webapp/index.xhtml b/guacamole/src/main/webapp/index.xhtml
index 8844dcef6..0acb4cc1e 100644
--- a/guacamole/src/main/webapp/index.xhtml
+++ b/guacamole/src/main/webapp/index.xhtml
@@ -113,6 +113,10 @@
                     clipboard.value = new_state[name];
             };
 
+            // Update clipboard with current data
+            if (state.getProperty("clipboard"))
+                clipboard.value = state.getProperty("clipboard");
+
             // Constructs the URL for a client which connects to the connection
             // with the given id.
             function getClientURL(id) {
@@ -193,14 +197,12 @@
                     }
                     
                     // Create link to client
-                    var clientLink = document.createElement("a");
                     var url = getClientURL(configs[i].id)
                     connection.onclick = new_client(url);
 
                     protocol.appendChild(protocolIcon);
 
-                    clientLink.textContent = configs[i].id;
-                    id.appendChild(clientLink);
+                    id.textContent = configs[i].id;
 
                     // Assemble caption
                     caption.appendChild(protocol);
diff --git a/guacamole/src/main/webapp/scripts/interface.js b/guacamole/src/main/webapp/scripts/interface.js
index e7f394d14..2d461fe08 100644
--- a/guacamole/src/main/webapp/scripts/interface.js
+++ b/guacamole/src/main/webapp/scripts/interface.js
@@ -233,6 +233,8 @@ GuacamoleUI.attach = function(guac) {
     
     var guac_display = guac.getDisplay();
 
+    var state = new GuacamoleSessionState();
+
     // Set document title appropriately, based on prefix and connection name
     function updateTitle() {
 
@@ -478,6 +480,10 @@ GuacamoleUI.attach = function(guac) {
                 GuacamoleUI.hideStatus();
                 title_prefix = null;
 
+                // Update clipboard with current data
+                if (state.getProperty("clipboard"))
+                    guac.setClipboard(state.getProperty("clipboard"));
+
                 // Regularly update screenshot if storage available
                 if (localStorage)
                     window.setInterval(updateThumbnail, 5000);
@@ -548,8 +554,6 @@ GuacamoleUI.attach = function(guac) {
 
     };
 
-    var state = new GuacamoleSessionState();
-
     // Server copy handler
     guac.onclipboard = function(data) {
         state.setProperty("clipboard", data);
diff --git a/guacamole/src/main/webapp/styles/login.css b/guacamole/src/main/webapp/styles/login.css
index 377390d24..8aed4a5ba 100644
--- a/guacamole/src/main/webapp/styles/login.css
+++ b/guacamole/src/main/webapp/styles/login.css
@@ -134,6 +134,11 @@ div#login-dialog #login-fields input {
     border: 1px solid #777;
     border-radius: 0.2em;
     width: 100%;
+
+    box-shadow:
+        1px 1px 0 rgba(255, 255, 255, 0.25),
+        inset 1px 1px 1px rgba(0, 0, 0, 0.25);
+    
 }
 
 div#login-dialog #login-fields img.logo {
@@ -291,8 +296,7 @@ div#recent-connections div.connection {
     background: #CDA;
 }
 
-.connection .name a {
-    text-decoration: none;
+.connection .name {
     color: black;
     font-weight: normal;
     padding: 0.1em;