diff --git a/frappe/tests/test_password.py b/frappe/tests/test_password.py
index 157fcc7b28..98141072e2 100644
--- a/frappe/tests/test_password.py
+++ b/frappe/tests/test_password.py
@@ -94,6 +94,17 @@ class TestPassword(unittest.TestCase):
 
 		self.assertTrue(not get_password_list(doc))
 
+	def test_password_unset(self):
+		doc = self.make_email_account()
+
+		doc.password = 'asdf'
+		doc.save()
+		self.assertEqual(doc.get_password(raise_exception=False), 'asdf')
+
+		doc.password = ''
+		doc.save()
+		self.assertEqual(doc.get_password(raise_exception=False), None)
+
 
 def get_password_list(doc):
 	return frappe.db.sql("""SELECT `password`