diff --git a/clientapp/pages/settings.js b/clientapp/pages/settings.js
index 3647fe4..a2b8cb8 100644
--- a/clientapp/pages/settings.js
+++ b/clientapp/pages/settings.js
@@ -27,6 +27,7 @@ module.exports = BasePage.extend({
         'drop': 'handleAvatarChange',
         'change #uploader': 'handleAvatarChange',
         'keydown #newLdapUser': 'addLdapUser',
+        'click .disconnect': 'handleDisconnect'
     },
     initialize: function (spec) {
         this.listenTo(this, 'deleteLdapUser', this.deleteLdapUser);
@@ -95,5 +96,8 @@ module.exports = BasePage.extend({
     },
     deleteLdapUser: function (id) {
         app.ldapUsers.deleteUser(id);
+    },
+    handleDisconnect: function (e) {
+        client.disconnect();
     }
 });
diff --git a/clientapp/templates.js b/clientapp/templates.js
index b905cf3..7312f63 100644
--- a/clientapp/templates.js
+++ b/clientapp/templates.js
@@ -557,7 +557,7 @@ exports.pages.groupchat = function anonymous(locals) {
 exports.pages.settings = function anonymous(locals) {
     var buf = [];
     with (locals || {}) {
-        buf.push('<section class="page main"><svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewbox="0 0 30 30" height="30" width="30"><g transform="scale(0.5)"><path d="M37.418,34.3c-2.1-2.721-2.622-6.352-1.292-9.604c0.452-1.107,1.104-2.1,1.902-2.951 c-0.753-0.877-1.573-1.697-2.507-2.387l-2.609,1.408c-1.05-0.629-2.194-1.112-3.414-1.421l-0.845-2.833 c-0.75-0.112-1.512-0.188-2.287-0.188c-0.783,0-1.54,0.075-2.288,0.188l-0.851,2.833c-1.215,0.309-2.355,0.792-3.41,1.421 l-2.614-1.408c-1.229,0.912-2.318,2-3.228,3.231l1.404,2.612c-0.628,1.053-1.11,2.193-1.419,3.411l-2.832,0.849 c-0.114,0.75-0.187,1.508-0.187,2.287c0,0.778,0.073,1.537,0.187,2.286l2.832,0.848c0.309,1.22,0.791,2.36,1.419,3.413l-1.404,2.61 c0.909,1.231,1.999,2.321,3.228,3.231l2.614-1.406c1.055,0.628,2.195,1.11,3.41,1.42l0.851,2.832 c0.748,0.114,1.505,0.188,2.288,0.188c0.775,0,1.537-0.074,2.287-0.188l0.845-2.832c1.224-0.31,2.364-0.792,3.414-1.42l0.062,0.033 l2.045-3.02L37.418,34.3z M26.367,36.776c-2.777,0-5.027-2.253-5.027-5.027c0-2.775,2.25-5.028,5.027-5.028 c2.774,0,5.024,2.253,5.024,5.028C31.391,34.523,29.141,36.776,26.367,36.776z"></path><path d="M51.762,24.505l-1.125-0.459l-1.451,3.55c-0.814,1.993-2.832,3.054-4.505,2.37l-0.355-0.144 c-1.673-0.686-2.37-2.856-1.558-4.849l1.451-3.551l-1.125-0.46c-2.225,0.608-4.153,2.2-5.092,4.501 c-1.225,2.997-0.422,6.312,1.771,8.436l-2.958,6.812l-2.204,3.249l-0.007,2.281l5.275,2.154l1.593-1.633l0.7-3.861l2.901-6.836 c3.049,0.018,5.947-1.785,7.174-4.779C53.186,28.983,52.924,26.499,51.762,24.505z"></path></g></svg><h1 id="title">Settings</h1><div id="avatarChanger"><h4>Change Avatar</h4><div class="uploadRegion"><p>Drag and drop a new avatar here</p><img/><form><input id="uploader" type="file"/></form></div></div><div><h4>Desktop Integration</h4><button class="enableAlerts">Enable alerts</button><button class="primary installFirefox">Install app</button><button class="soundNotifs">sound notifications</button></div><div id="ldapSettings"><h4>LDAP settings</h4><ul id="ldapUsers"></ul><input type="text" placeholder="add a ldap user" id="newLdapUser"/></div><div><button class="logout">Logout</button></div></section>');
+        buf.push('<section class="page main"><svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewbox="0 0 30 30" height="30" width="30"><g transform="scale(0.5)"><path d="M37.418,34.3c-2.1-2.721-2.622-6.352-1.292-9.604c0.452-1.107,1.104-2.1,1.902-2.951 c-0.753-0.877-1.573-1.697-2.507-2.387l-2.609,1.408c-1.05-0.629-2.194-1.112-3.414-1.421l-0.845-2.833 c-0.75-0.112-1.512-0.188-2.287-0.188c-0.783,0-1.54,0.075-2.288,0.188l-0.851,2.833c-1.215,0.309-2.355,0.792-3.41,1.421 l-2.614-1.408c-1.229,0.912-2.318,2-3.228,3.231l1.404,2.612c-0.628,1.053-1.11,2.193-1.419,3.411l-2.832,0.849 c-0.114,0.75-0.187,1.508-0.187,2.287c0,0.778,0.073,1.537,0.187,2.286l2.832,0.848c0.309,1.22,0.791,2.36,1.419,3.413l-1.404,2.61 c0.909,1.231,1.999,2.321,3.228,3.231l2.614-1.406c1.055,0.628,2.195,1.11,3.41,1.42l0.851,2.832 c0.748,0.114,1.505,0.188,2.288,0.188c0.775,0,1.537-0.074,2.287-0.188l0.845-2.832c1.224-0.31,2.364-0.792,3.414-1.42l0.062,0.033 l2.045-3.02L37.418,34.3z M26.367,36.776c-2.777,0-5.027-2.253-5.027-5.027c0-2.775,2.25-5.028,5.027-5.028 c2.774,0,5.024,2.253,5.024,5.028C31.391,34.523,29.141,36.776,26.367,36.776z"></path><path d="M51.762,24.505l-1.125-0.459l-1.451,3.55c-0.814,1.993-2.832,3.054-4.505,2.37l-0.355-0.144 c-1.673-0.686-2.37-2.856-1.558-4.849l1.451-3.551l-1.125-0.46c-2.225,0.608-4.153,2.2-5.092,4.501 c-1.225,2.997-0.422,6.312,1.771,8.436l-2.958,6.812l-2.204,3.249l-0.007,2.281l5.275,2.154l1.593-1.633l0.7-3.861l2.901-6.836 c3.049,0.018,5.947-1.785,7.174-4.779C53.186,28.983,52.924,26.499,51.762,24.505z"></path></g></svg><h1 id="title">Settings</h1><div id="avatarChanger"><h4>Change Avatar</h4><div class="uploadRegion"><p>Drag and drop a new avatar here</p><img/><form><input id="uploader" type="file"/></form></div></div><div><h4>Desktop Integration</h4><button class="enableAlerts">Enable alerts</button><button class="primary installFirefox">Install app</button><button class="soundNotifs">sound notifications</button></div><div id="ldapSettings"><h4>LDAP settings</h4><ul id="ldapUsers"></ul><input type="text" placeholder="add a ldap user" id="newLdapUser"/></div><div><button class="disconnect">Disconnect</button><button class="primary logout">Logout</button></div></section>');
     }
     return buf.join("");
 };
diff --git a/clientapp/templates/pages/settings.jade b/clientapp/templates/pages/settings.jade
index f6f6cd4..80acb41 100644
--- a/clientapp/templates/pages/settings.jade
+++ b/clientapp/templates/pages/settings.jade
@@ -26,4 +26,5 @@ section.page.main
     input(type="text", placeholder="add a ldap user")#newLdapUser
 
   div
-    button.logout Logout
+    button.disconnect Disconnect
+    button.primary.logout Logout
diff --git a/public/css/otalk.css b/public/css/otalk.css
index 048c7ed..7cb6204 100644
--- a/public/css/otalk.css
+++ b/public/css/otalk.css
@@ -1639,9 +1639,10 @@ button.secondary:hover:not(:disabled) {
   max-height: 50px;
   height: auto;
 }
+.main > div .enableAlerts,
 .main > div .installFirefox,
 .main > div .soundNotifs {
-  margin-left: 5px;
+  margin-right: 5px;
 }
 .main > div .soundNotifs.primary:before {
   content: 'Disable ';
@@ -1727,6 +1728,10 @@ button.secondary:hover:not(:disabled) {
 .uploadRegion img {
   margin: 10px 0;
 }
+.disconnect,
+.logout {
+  margin-right: 5px;
+}
 .aux {
   background: #fafafb;
 }
diff --git a/public/css/pages/settings.styl b/public/css/pages/settings.styl
index 9ce2b29..2cacf51 100644
--- a/public/css/pages/settings.styl
+++ b/public/css/pages/settings.styl
@@ -43,8 +43,8 @@
       max-height: 50px
       height: auto
 
-    .installFirefox, .soundNotifs
-      margin-left: 5px
+    .enableAlerts, .installFirefox, .soundNotifs
+      margin-right: 5px
 
     .soundNotifs
       &.primary
@@ -117,3 +117,6 @@
 
   img
     margin: 10px 0
+
+.disconnect, .logout
+  margin-right: 5px