diff --git a/index.html b/index.html
index 67c9828..33dc0d6 100644
--- a/index.html
+++ b/index.html
@@ -71,8 +71,8 @@
       <div class="alert alert-danger" ng-show="oldWeechatError" ng-cloak>
         <strong>Weechat version error</strong> Weechat connected but did not respond to a handshake. This could mean weechat < version 2.9. Verify your weechat version and check "Allow Plaintext Authentication" if it's < 2.9.
       </div>
-      <div class="alert alert-danger" ng-show="hashAlgorithemDisagree" ng-cloak>
-        <strong>Hash algorithem error</strong> Weechat and glowing bear did not agree on a hashing algorithem, please do /set relay.network.password_hash_algo "pbkdf2+sha512" in weechat.
+      <div class="alert alert-danger" ng-show="hashAlgorithmDisagree" ng-cloak>
+        <strong>Hash algorithm error</strong> Weechat and glowing bear did not agree on a hashing algorithm, please do /set relay.network.password_hash_algo "pbkdf2+sha512" in weechat.
       </div>
       <div class="panel-group accordion">
         <div class="panel" data-state="active" ng-show=false>
diff --git a/js/connection.js b/js/connection.js
index 05a9e63..84292f1 100644
--- a/js/connection.js
+++ b/js/connection.js
@@ -24,7 +24,7 @@ weechat.factory('connection',
     var connect = function (host, port, path, passwd, ssl, useTotp, totp, noCompression, successCallback, failCallback) {
         $rootScope.passwordError = false;
         $rootScope.oldWeechatError = false;
-        $rootScope.hashAlgorithemDisagree = false;
+        $rootScope.hashAlgorithmDisagree = false;
         connectionData = [host, port, path, passwd, ssl, noCompression];
         var proto = ssl ? 'wss' : 'ws';
         // If host is an IPv6 literal wrap it in brackets
@@ -319,10 +319,10 @@ weechat.factory('connection',
 
                     if(passwordMethod != "pbkdf2+sha512")
                     {
-                        $rootScope.hashAlgorithemDisagree = true;
+                        $rootScope.hashAlgorithmDisagree = true;
                         $rootScope.$emit('relayDisconnect');
                         $rootScope.$digest() // Have to do this otherwise change detection doesn't see the error.
-                        throw new Error('No password hash algorithem returned.');
+                        throw new Error('No password hash algorithm returned.');
                     }
                     
                 }
@@ -450,7 +450,7 @@ weechat.factory('connection',
 
         var handleWrongPassword = function() {
             // Connection got closed, lets check if we ever was connected successfully
-            if (!$rootScope.waseverconnected && !$rootScope.errorMessage && !$rootScope.oldWeechatError && !$rootScope.hashAlgorithemDisagree) {
+            if (!$rootScope.waseverconnected && !$rootScope.errorMessage && !$rootScope.oldWeechatError && !$rootScope.hashAlgorithmDisagree) {
                 $rootScope.passwordError = true;
                 $rootScope.$apply();
             }
diff --git a/js/weechat.js b/js/weechat.js
index 478d252..f21d739 100644
--- a/js/weechat.js
+++ b/js/weechat.js
@@ -631,7 +631,7 @@
      * Formats a handshake command.
      *
      * @param params Parameters:
-     *            password: list of supported hash algorithems, colon separated (optional)
+     *            password: list of supported hash algorithms, colon separated (optional)
      *            compression: compression ('off' or 'zlib') (optional)
      * @return Formatted handshake command string
      */