diff --git a/index.html b/index.html
index 684f47a..713bef9 100644
--- a/index.html
+++ b/index.html
@@ -60,11 +60,15 @@
                       <input type="text" class="form-control monospace" id="host" ng-model="host" placeholder="Address">
                       <input type="text" class="form-control monospace" id="port" ng-model="port" placeholder="9001">
                     </div>
+                    <label class="control-label" for="password">WeeChat relay password</label> 
+                    <input type="password" class="form-control monospace" id="password" ng-model="password" placeholder="Password">
                     <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 monospace" id="password" ng-model="password" placeholder="Password">
+
                     <div class="checkbox">
                       <label class="control-label" for="savepassword">
                           <input type="checkbox" id="savepassword" ng-model="savepassword">
diff --git a/js/glowingbear.js b/js/glowingbear.js
index 6ae219e..6b8cab0 100644
--- a/js/glowingbear.js
+++ b/js/glowingbear.js
@@ -263,7 +263,9 @@ function($rootScope,
             ]).then(
                 null,
                 function() {
-                    $rootScope.passwordError = true;
+                    // Connection got closed, lets check if we ever was connected successfully
+                    if(!$rootScope.waseverconnected)
+                        $rootScope.passwordError = true;
                 }
             );
 
@@ -310,12 +312,19 @@ function($rootScope,
 
         };
 
+        var onmessage = function(event) {
+            // If we recieve a message from WeeChat it means that
+            // password was OK. Store that result and check for it
+            // in the failure handler.
+            $rootScope.waseverconnected = true;
+        }
+
+
         var onclose = function () {
             /*
              * Handles websocket disconnection
              */
             $log.info("Disconnected from relay");
-
             failCallbacks('disconnection');
             $rootScope.connected = false;
             $rootScope.$apply();
@@ -345,6 +354,7 @@ function($rootScope,
                          'binaryType': "arraybuffer",
                          'onopen': onopen,
                          'onclose': onclose,
+                         'onmessage': onmessage,
                          'onerror': onerror,
                      });
 
@@ -518,7 +528,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
     $scope.buffers = models.model.buffers;
     $scope.activeBuffer = models.getActiveBuffer;
 
-    $rootScope.commands = [];
+    $rootScope.waseverconnected = false;
 
     $rootScope.models = models;
 
diff --git a/js/websockets.js b/js/websockets.js
index bdcf949..160583c 100644
--- a/js/websockets.js
+++ b/js/websockets.js
@@ -106,7 +106,7 @@ function($rootScope, $q) {
             // otherwise emit it
             $rootScope.$emit('onMessage', message);
         }
-        $rootScope.commands.push("RECV: " + evt.data + " TYPE:" + evt.type);
+
         $rootScope.$apply();
     };