diff --git a/frappe/database/database.py b/frappe/database/database.py
index 05169364f0..28ae177885 100644
--- a/frappe/database/database.py
+++ b/frappe/database/database.py
@@ -692,7 +692,7 @@ class Database(object):
 				filters={"field": ("in", tuple(to_update)), "doctype": dt}, debug=debug
 			)
 
-			singles_data = ((dt, key, str(value)) for key, value in to_update.items())
+			singles_data = ((dt, key, str(value) if value else value) for key, value in to_update.items())
 			query = (
 				frappe.qb.into("Singles")
 					.columns("doctype", "field", "value")
diff --git a/frappe/tests/test_website.py b/frappe/tests/test_website.py
index 992d876243..cfadb09a04 100644
--- a/frappe/tests/test_website.py
+++ b/frappe/tests/test_website.py
@@ -20,6 +20,7 @@ class TestWebsite(unittest.TestCase):
 			doctype='User',
 			email='test-user-for-home-page@example.com',
 			first_name='test')).insert(ignore_if_duplicate=True)
+		user.reload()
 
 		role = frappe.get_doc(dict(
 			doctype = 'Role',
diff --git a/frappe/website/utils.py b/frappe/website/utils.py
index cb8008277c..7beefc8164 100644
--- a/frappe/website/utils.py
+++ b/frappe/website/utils.py
@@ -88,7 +88,7 @@ def get_home_page():
 
 			# portal default
 			if not home_page:
-				home_page = frappe.db.get_value("Portal Settings", None, "default_portal_home")
+				home_page = frappe.db.get_single_value("Portal Settings", "default_portal_home")
 
 		# by hooks
 		if not home_page:
@@ -96,7 +96,7 @@ def get_home_page():
 
 		# global
 		if not home_page:
-			home_page = frappe.db.get_value("Website Settings", None, "home_page")
+			home_page = frappe.db.get_single_value("Website Settings", "home_page")
 
 		if not home_page:
 			home_page = "login" if frappe.session.user == 'Guest' else "me"