diff --git a/authentication/admin.py b/authentication/admin.py
index ec573399..bcd2f68e 100644
--- a/authentication/admin.py
+++ b/authentication/admin.py
@@ -5,12 +5,17 @@
 
 class ProfileAdmin(admin.ModelAdmin):
     list_display = ["pk", "initial_context_id", "age"]
-    search_fields = ["initial_context_id"]
+    search_fields = ["initial_context_id", "user__token", "user__pk"]
 
 
 class WalletAdmin(admin.ModelAdmin):
     list_display = ["pk", "wallet_type", "user_profile"]
-    search_fields = ["profile__initial_context_id", "wallet_type"]
+    search_fields = [
+        "user_profile__initial_context_id",
+        "wallet_type",
+        "user_profile__pk",
+        "user_profile__user__token",
+    ]
 
 
 admin.site.register(Wallet, WalletAdmin)