diff --git a/guacamole/src/main/webapp/client.xhtml b/guacamole/src/main/webapp/client.xhtml
index 370803bb0..25738d89b 100644
--- a/guacamole/src/main/webapp/client.xhtml
+++ b/guacamole/src/main/webapp/client.xhtml
@@ -45,12 +45,12 @@
 
             <button id="showKeyboard">Show Keyboard</button>
             <button id="ctrlAltDelete">Ctrl-Alt-Delete</button>
+            <button id="logout">Logout</button>
 
             <!-- Logo and status -->
             <img id="status-logo" class="logo" src="images/guacamole-logo-24.png" alt="Guacamole" title="Guacamole ${project.version}"/>
             <span id="state"></span>
 
-            <a href="logout">Logout</a>
         </div>
 
 
@@ -313,8 +313,14 @@
                 guac.sendKeyEvent(0, KEYSYM_DELETE);
                 guac.sendKeyEvent(0, KEYSYM_ALT);
                 guac.sendKeyEvent(0, KEYSYM_CTRL);
-            }
+            };
 
+            // Logout
+            var logout = document.getElementById("logout");
+
+            logout.onclick = function() {
+                window.location.href = "logout";
+            };
 
             try {
 
diff --git a/guacamole/src/main/webapp/styles/client.css b/guacamole/src/main/webapp/styles/client.css
index 28a629039..99a09ae38 100644
--- a/guacamole/src/main/webapp/styles/client.css
+++ b/guacamole/src/main/webapp/styles/client.css
@@ -106,11 +106,6 @@ img {
     border: none;
 }
 
-img#license {
-    float: right;
-    margin: 2px;
-}
-
 div#display {
     position: relative;
     width: 640px;