diff --git a/src/static/css/pad.css b/src/static/css/pad.css
index e9a91f4e..19998418 100644
--- a/src/static/css/pad.css
+++ b/src/static/css/pad.css
@@ -936,9 +936,8 @@ input[type=checkbox] {
 .chatAndUsersChat{
   bottom:0px !important;
   padding:0 !important;
-  margin:0 !important;
+  margin: 165px 0px 0px 0px;
   right:0 !important;
-  top: 200px;
   width:182px !important;
   border: none !important;
   padding:5px !important;
diff --git a/src/static/js/chat.js b/src/static/js/chat.js
index 9cb5b401..102f4637 100644
--- a/src/static/js/chat.js
+++ b/src/static/js/chat.js
@@ -57,7 +57,8 @@ var chat = (function()
     },
     chatAndUsers: function(fromInitialCall)
     {
-      if(!userAndChat || fromInitialCall){
+      var toEnable = $('#options-chatandusers').is(":checked");
+      if(toEnable || !userAndChat || fromInitialCall){
         padcookie.setPref("chatAndUsers", true);
         chat.stickToScreen(true);
         $('#options-stickychat').prop('checked', true)
diff --git a/src/static/js/pad_editbar.js b/src/static/js/pad_editbar.js
index 56018b35..4fcb20ea 100644
--- a/src/static/js/pad_editbar.js
+++ b/src/static/js/pad_editbar.js
@@ -195,9 +195,6 @@ var padeditbar = (function()
       // If chat and Users is enabled..
       if($('#options-chatandusers').is(":checked")){
         $('#users').css("top", $('#editorcontainer').offset().top + "px");
-
-        // We also need to move the chatbox lower..
-        $('#chatbox').css("top", 10 + $('#users').height() + $('#editorcontainer').offset().top + "px");
       }
 
     },