diff --git a/endpoints/api/user.py b/endpoints/api/user.py
index e0446e122..90ef38603 100644
--- a/endpoints/api/user.py
+++ b/endpoints/api/user.py
@@ -91,12 +91,12 @@ def user_view(user, previous_username=None):
     return org_response
 
   # Retrieve the organizations for the user.
-  organizations = list(model.organization.get_user_organizations(user.username))
+  organizations = {o.username: o for o in model.organization.get_user_organizations(user.username)}
 
   # Add any public namespaces.
   public_namespaces = app.config.get('PUBLIC_NAMESPACES', [])
   if public_namespaces:
-    organizations.extend([model.user.get_namespace_user(ns) for ns in public_namespaces])
+    organizations.update({ns: model.user.get_namespace_user(ns) for ns in public_namespaces})
 
   def login_view(login):
     try:
@@ -144,7 +144,7 @@ def user_view(user, previous_username=None):
   user_view_perm = UserReadPermission(user.username)
   if user_view_perm.can():
     user_response.update({
-      'organizations': [org_view(o, user_admin=user_admin.can()) for o in organizations],
+      'organizations': [org_view(o, user_admin=user_admin.can()) for o in organizations.values()],
     })