diff --git a/lib/server/auth.js b/lib/server/auth.js
index e98d908e..9088003e 100644
--- a/lib/server/auth.js
+++ b/lib/server/auth.js
@@ -5,10 +5,7 @@
         
         httpAuth            = require('http-auth'),
         config              = require(DIR + 'config'),
-        cryptPassword       = require(DIR + 'password'),
-        
-        oldPass,
-        oldName;
+        cryptPassword       = require(DIR + 'password');
         
     module.exports = function() {
         var auth   = httpAuth.basic({
@@ -32,29 +29,15 @@
     }
     
     function check(username, password, callback) {
-        var hash,
+        var sameName,
+            samePass,
             name    = config('username'),
             pass    = config('password'),
-            algo    = config('algo'),
-            equal   = username === name;
+            algo    = config('algo');
         
-        if (!oldPass)
-            oldPass = pass;
+        sameName    = username === name;
+        samePass    = pass === cryptPassword(algo, password);
         
-        if (!oldName)
-            oldName = name;
-        
-        if (!equal)
-            username === oldName;
-        
-        hash        = cryptPassword(algo, password);
-        equal       = pass === hash && equal;
-        
-        if (!equal) {
-            hash = cryptPassword(algo, oldPass);
-            equal  = pass === hash && equal;
-        }
-        
-        callback(equal);
+        callback(sameName && samePass);
     }
 })();