diff --git a/frappe/utils/password_strength.py b/frappe/utils/password_strength.py
index f94893ed53..5591cfbb14 100644
--- a/frappe/utils/password_strength.py
+++ b/frappe/utils/password_strength.py
@@ -3,14 +3,14 @@
 
 from __future__ import unicode_literals
 
-import zxcvbn
+from zxcvbn import zxcvbn
 import frappe
 from frappe import _
 
 def test_password_strength(password, user_inputs=None):
 	'''Wrapper around zxcvbn.password_strength'''
-	result = zxcvbn.password_strength(password, user_inputs)
-	result['feedback'] = get_feedback(result['score'], result['match_sequence'])
+	result = zxcvbn(password, user_inputs)
+	result['feedback'] = get_feedback(result['score'], result['sequence'])
 	return result
 
 # NOTE: code modified for frappe translations
@@ -37,7 +37,7 @@ def get_feedback (score, sequence):
 	"""
 	Returns the feedback dictionary consisting of ("warning","suggestions") for the given sequences.
 	"""
-	minimum_password_score = frappe.db.get_single_value("System Settings", "minimum_password_score")
+	minimum_password_score = int(frappe.db.get_single_value("System Settings", "minimum_password_score"))
 
 	global default_feedback
 	# Starting feedback
diff --git a/requirements.txt b/requirements.txt
index 44a441e34d..b5c564eede 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -37,7 +37,7 @@ cryptography
 pyopenssl
 ndg-httpsclient
 pyasn1
-zxcvbn
+zxcvbn-python
 psutil
 unittest-xml-reporting
 oauthlib