diff --git a/apps/social/views.py b/apps/social/views.py
index 474d5bf63..5dc52d8b9 100644
--- a/apps/social/views.py
+++ b/apps/social/views.py
@@ -1105,7 +1105,13 @@ def ignore_follower(request):
 def find_friends(request):
     query = request.GET['query']
     limit = int(request.GET.get('limit', 3))
-    profiles = MSocialProfile.objects.filter(username__iexact=query)[:limit]
+    profiles = []
+    
+    if '@' in query:
+        email = re.search(r'[\w\.-]+@[\w\.-]+', query).group(0)
+        profiles = MSocialProfile.objects.filter(email__icontains=email)[:limit]
+    if not profiles:
+        profiles = MSocialProfile.objects.filter(username__iexact=query)[:limit]
     if not profiles:
         profiles = MSocialProfile.objects.filter(username__icontains=query)[:limit]
     if not profiles: