diff --git a/base/accounts.py b/base/accounts.py
index 4489ea0eb0..1dd9f4ef04 100644
--- a/base/accounts.py
+++ b/base/accounts.py
@@ -36,6 +36,9 @@ class UserManager(object):
         return self.get(email=email)
 
     def get(self, email=None, id=None):
+        if not email and not id:
+            raise User.DoesNotExist, 'User matching query does not exits.'
+            
         if email:
             emailuser = ccnet_threaded_rpc.get_emailuser(email)
         if id:
diff --git a/organizations/templates/organizations/org_info.html b/organizations/templates/organizations/org_info.html
index 575a8338bd..5f720536f9 100644
--- a/organizations/templates/organizations/org_info.html
+++ b/organizations/templates/organizations/org_info.html
@@ -9,7 +9,7 @@
 {% if org_users %}
 <ul>
     {% for member in org_users %}
-	<li class="org-member">{% avatar member.user_name 16 %}<span class="org-member-name"><a href="{{ SITE_ROOT }}profile/{{ member.email }}/">{{ member.email|email2nickname }}</a></span></li>
+	<li class="org-member">{% avatar member.email 16 %}<span class="org-member-name"><a href="{{ SITE_ROOT }}profile/{{ member.email }}/">{{ member.email|email2nickname }}</a></span></li>
     {% endfor %}
 </ul>
 {% else %}