diff --git a/re2o/login.py b/re2o/login.py
index 471c2e02..0b552239 100644
--- a/re2o/login.py
+++ b/re2o/login.py
@@ -114,9 +114,9 @@ class CryptPasswordHasher(hashers.BasePasswordHasher):
         Check password against encoded using CRYPT algorithm
         """
         assert encoded.startswith(self.algorithm)
-        salt = hash_password_salt(challenge_password)
-        return constant_time_compare(crypt.crypt(password.encode(), salt),
-                                     challenge.encode())
+        salt = hash_password_salt(encoded)
+        return constant_time_compare(crypt.crypt(password, salt),
+                                     encoded)
 
     def safe_summary(self, encoded):
         """