diff --git a/app/dashboard/tip_views.py b/app/dashboard/tip_views.py
index bcee4e1efbe..0cf3dd97ac7 100644
--- a/app/dashboard/tip_views.py
+++ b/app/dashboard/tip_views.py
@@ -157,7 +157,7 @@ def receive_tip_v3(request, key, txid, network):
             # tip.username
             # tip.metadata.max_redemptions
             # tip.metadata.override_send_amount
-            # tip.amount to the amount you want to send 
+            # tip.amount to the amount you want to send
             # ,"override_send_amount":1,"max_redemptions":29
 
             num_redemptions += 1
@@ -418,10 +418,11 @@ def send_tip_2(request):
             profile = profiles.first()
             user['id'] = profile.id
             user['text'] = profile.handle
+            user['avatar_url'] = profile.avatar_url
 
             if profile.avatar_baseavatar_related.exists():
-                user['avatar_id'] = profile.avatar_baseavatar_related.first().pk
-                user['avatar_url'] = profile.avatar_baseavatar_related.first().avatar_url
+                user['avatar_id'] = profile.avatar_baseavatar_related.filter(active=True).first().pk
+                user['avatar_url'] = profile.avatar_baseavatar_related.filter(active=True).first().avatar_url
                 user['preferred_payout_address'] = profile.preferred_payout_address
 
     params = {
diff --git a/app/dashboard/views.py b/app/dashboard/views.py
index ec0c7d2c373..eda669314c0 100644
--- a/app/dashboard/views.py
+++ b/app/dashboard/views.py
@@ -3571,10 +3571,10 @@ def get_users(request):
             profile_json = {}
             profile_json['id'] = user.id
             profile_json['text'] = user.handle
-            #profile_json['email'] = user.email
+            profile_json['avatar_url'] = user.avatar_url
             if user.avatar_baseavatar_related.exists():
-                profile_json['avatar_id'] = user.avatar_baseavatar_related.first().pk
-                profile_json['avatar_url'] = user.avatar_baseavatar_related.first().avatar_url
+                profile_json['avatar_id'] = user.avatar_baseavatar_related.filter(active=True).first().pk
+                profile_json['avatar_url'] = user.avatar_baseavatar_related.filter(active=True).first().avatar_url
             profile_json['preferred_payout_address'] = user.preferred_payout_address
             results.append(profile_json)
         # try github