diff --git a/endpoints/api/user.py b/endpoints/api/user.py
index 23bc3137a..d0d089dcd 100644
--- a/endpoints/api/user.py
+++ b/endpoints/api/user.py
@@ -43,7 +43,7 @@ def user_view(user):
     try:
       metadata = json.loads(login.metadata_json)
     except:
-      metadata = None
+      metadata = {}
 
     return {
       'service': login.service.name,
diff --git a/test/data/test.db b/test/data/test.db
index 4d0428331..b64829db2 100644
Binary files a/test/data/test.db and b/test/data/test.db differ