diff --git a/lib/server/auth.js b/lib/server/auth.js
index 9088003e..841adef8 100644
--- a/lib/server/auth.js
+++ b/lib/server/auth.js
@@ -36,7 +36,7 @@
             algo    = config('algo');
         
         sameName    = username === name;
-        samePass    = pass === cryptPassword(algo, password);
+        samePass    = pass === cryptPassword(password, algo);
         
         callback(sameName && samePass);
     }
diff --git a/lib/server/password.js b/lib/server/password.js
index df084404..aedb364e 100644
--- a/lib/server/password.js
+++ b/lib/server/password.js
@@ -3,13 +3,14 @@
     
     var crypto = require('crypto');
     
-    module.exports = function(algo, password) {
+    module.exports = function(password, algo) {
         var result, sha;
         
-        if (!password) {
-            password = algo;
+        if (!password)
+            throw Error('password could not be empty!');
+        
+        if (!algo)
             algo = 'sha512WithRSAEncryption';
-        }
         
         sha = crypto.createHash(algo);