diff --git a/src/BackOffice/BackOffice.csproj b/src/BackOffice/BackOffice.csproj
index 1e007e9..8bab5d7 100644
--- a/src/BackOffice/BackOffice.csproj
+++ b/src/BackOffice/BackOffice.csproj
@@ -138,7 +138,7 @@
     
     <!-- CMS Protobuf NuGet package (used for both local dev and Docker builds) -->
     <ItemGroup>
-        <PackageReference Include="Foursat.CMSMicroservice.Protobuf" Version="0.0.180" />
+        <PackageReference Include="Foursat.CMSMicroservice.Protobuf" Version="0.0.183" />
     </ItemGroup>
     
     <!-- ============================================================ -->
diff --git a/src/BackOffice/Pages/Club/ClubMembers.razor b/src/BackOffice/Pages/Club/ClubMembers.razor
index 5d222f0..f57385c 100644
--- a/src/BackOffice/Pages/Club/ClubMembers.razor
+++ b/src/BackOffice/Pages/Club/ClubMembers.razor
@@ -3,6 +3,7 @@
 
 @using Google.Protobuf.WellKnownTypes
 @using BackOffice.Pages.Club.Components
+@using BackOffice.Pages.AutoComplete
 @using CMSMicroservice.Protobuf.Protos.ClubMembership
 
 <div>
@@ -16,7 +17,8 @@
         <ToolBarContent>
             <MudText Typo="Typo.h6">لیست اعضا</MudText>
             <MudSpacer />
-            <MudStack Row="true" Spacing="2">
+            <MudStack Row="true" Spacing="2" AlignItems="AlignItems.Center">
+                <UserAutoComplete Label="جستجوی کاربر" @bind-SelectedUserId="_filterUserId" />
                 <MudSwitch T="bool" @bind-Value="_filterIsActive" 
                           Color="Color.Success" 
                           Label="فقط فعال‌ها" />
diff --git a/src/BackOffice/Pages/Club/ClubMembers.razor.cs b/src/BackOffice/Pages/Club/ClubMembers.razor.cs
index 855c39e..0805d2f 100644
--- a/src/BackOffice/Pages/Club/ClubMembers.razor.cs
+++ b/src/BackOffice/Pages/Club/ClubMembers.razor.cs
@@ -16,6 +16,7 @@ public partial class ClubMembers
 
     private MudDataGrid<ClubMembershipModel> _gridData;
     private bool _filterIsActive = true;
+    private long? _filterUserId;
 
     private async Task<GridData<ClubMembershipModel>> ServerReload(GridState<ClubMembershipModel> state)
     {
@@ -30,6 +31,9 @@ public partial class ClubMembers
             // Always use the filter value since it's now a bool (not nullable)
             request.IsActive = _filterIsActive;
 
+            if (_filterUserId.HasValue && _filterUserId.Value > 0)
+                request.UserId = _filterUserId.Value;
+
             var result = await ClubContract.GetAllClubMembershipsAsync(request);
 
             if (result?.Models != null && result.Models.Any())
diff --git a/src/BackOffice/Pages/Club/Components/ActivateClubDialog.razor b/src/BackOffice/Pages/Club/Components/ActivateClubDialog.razor
index 8f83a9d..1df8afd 100644
--- a/src/BackOffice/Pages/Club/Components/ActivateClubDialog.razor
+++ b/src/BackOffice/Pages/Club/Components/ActivateClubDialog.razor
@@ -1,14 +1,11 @@
 @using CMSMicroservice.Protobuf.Protos.ClubMembership
+@using BackOffice.Pages.AutoComplete
 
 <MudDialog>
     <DialogContent>
         <MudForm @ref="_form" @bind-IsValid="_formValid">
             <MudStack Spacing="3">
-                <MudNumericField @bind-Value="_model.UserId" 
-                                Label="شناسه کاربر" 
-                                Required="true"
-                                RequiredError="شناسه کاربر الزامی است"
-                                Variant="Variant.Outlined" />
+                <UserAutoComplete Label="انتخاب کاربر" @bind-SelectedUserId="_model.UserId" />
 
                 <MudNumericField @bind-Value="_model.PackageId" 
                                 Label="شناسه پکیج" 
@@ -67,12 +64,18 @@
         await _form.Validate();
         if (!_formValid) return;
 
+        if (!_model.UserId.HasValue || _model.UserId.Value <= 0)
+        {
+            Snackbar.Add("لطفاً کاربر را انتخاب کنید.", Severity.Warning);
+            return;
+        }
+
         _isSubmitting = true;
         try
         {
             var request = new ActivateClubMembershipRequest
             {
-                UserId = _model.UserId,
+                UserId = _model.UserId.Value,
                 PackageId = _model.PackageId,
                 DurationMonths = _model.DurationMonths
             };
@@ -94,7 +97,7 @@
 
     private class ActivateModel
     {
-        public long UserId { get; set; }
+        public long? UserId { get; set; }
         public long PackageId { get; set; }
         public int DurationMonths { get; set; } = 1;
     }
diff --git a/src/BackOffice/Pages/Wallet/WalletManagementPage.razor b/src/BackOffice/Pages/Wallet/WalletManagementPage.razor
index 5c0fb22..4ba9803 100644
--- a/src/BackOffice/Pages/Wallet/WalletManagementPage.razor
+++ b/src/BackOffice/Pages/Wallet/WalletManagementPage.razor
@@ -30,7 +30,14 @@
                 </ToolBarContent>
                 <Columns>
                     <PropertyColumn Property="x => x.Id" Title="شناسه" />
-                    <PropertyColumn Property="x => x.UserId" Title="کاربر" />
+                    <PropertyColumn Property="x => x.UserId" Title="کاربر">
+                        <CellTemplate>
+                            <MudStack Spacing="0">
+                                <MudText Typo="Typo.body2"><strong>@context.Item.UserName</strong></MudText>
+                                <MudText Typo="Typo.caption" Color="Color.Secondary">ID: @context.Item.UserId</MudText>
+                            </MudStack>
+                        </CellTemplate>
+                    </PropertyColumn>
                     <TemplateColumn Title="موجودی اصلی">
                         <CellTemplate>
                             <MudText Color="Color.Primary"><strong>@context.Item.Balance.ToString("N0")</strong> تومان</MudText>