diff --git a/css/glowingbear.css b/css/glowingbear.css
index 139827b..3b20813 100644
--- a/css/glowingbear.css
+++ b/css/glowingbear.css
@@ -95,7 +95,7 @@ input#sendMessage {
     border: 0;
     width: 100%;
 }
-.panel input {
+.panel input, .panel .input-group {
   max-width: 300px;
 }
 input[type=text], input[type=password], .badge {
diff --git a/index.html b/index.html
index ceee349..f2b003a 100644
--- a/index.html
+++ b/index.html
@@ -45,27 +45,28 @@
               <div class="panel-body">
                 <form class="form-signin" role="form">
                   <div class="form-group">
-                    <label class="control-label" for="host">WeeChat hostname</label>
-                    <input type="text" class="form-control" id="host" ng-model="host" placeholder="Address">
-                    <p class="help-block">Enter the hostname to the WeeChat relay</p>
-                  </div>
-                  <div class="form-group">
-                    <label class="control-label" for="port">WeeChat port number</label>
-                    <input type="text" class="form-control" id="port" ng-model="port" placeholder="9001">
-                    <p class="help-block">Enter the the port to the WeeChat relay</p>
-                  </div>
-                  <div class="form-group">
-                    <label class="control-label" for="password">WeeChat relay password</label> 
+                    <label class="control-label" for="host">WeeChat relay hostname and port number</label>
+                    <div class="input-group">
+                      <input type="text" class="form-control" id="host" ng-model="host" placeholder="Address">
+                      <input type="text" class="form-control" id="port" ng-model="port" placeholder="9001">
+                    </div>
                     <div class="alert alert-danger" ng-show="passwordError">
                       Error wrong password
                     </div>
+                    <label class="control-label" for="password">WeeChat relay password</label> 
                     <input type="password" class="form-control" id="password" ng-model="password" placeholder="Password">
-                    <p class="help-block">Password will be stored in your browser session</p>
-                  </div>
-                  <div class="form-group">
-                    <label class="control-label" for="proto">Encryption</label>
-                    <input type="checkbox" class="form-control" id="ssl" ng-model="ssl">
-                    <p class="help-block">Read encryption instructions for help</p>
+                    <div class="checkbox">
+                      <label>
+                          <input type="checkbox" class="checkbox" id="savepassword" ng-model="savepassword">
+                          Save password in your browser
+                      </label>
+                    </div>
+                    <div class="checkbox">
+                      <label class="control-label " for="ssl">
+                        <input type="checkbox" class="" id="ssl" ng-model="ssl">
+                        Encryption. Read instructions for help
+                      </label>
+                    </div>
                   </div>
                   <div class="form-group">
                     <label class="control-label" for="port">Lines</label>
diff --git a/js/websockets.js b/js/websockets.js
index b14898f..e7dae9e 100644
--- a/js/websockets.js
+++ b/js/websockets.js
@@ -401,12 +401,12 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
     $store.bind($scope, "host", "localhost");
     $store.bind($scope, "port", "9001");
     $store.bind($scope, "proto", "weechat");
-    $store.bind($scope, "password", "");
     $store.bind($scope, "ssl", false);
     $store.bind($scope, "lines", "40");
-    // TODO checkbox for saving password or not?
-    // $scope.password = "";
-    //
+    $store.bind($scope, "savepassword", false);
+    if($scope.savepassword) {
+        $store.bind($scope, "password", "");
+    }
 
     // Save setting for displaying only buffers with unread messages
     $store.bind($scope, "onlyUnread", false);