diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/UserMenu.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/UserMenu.razor
index d6c56d0648..75c0aacf01 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/UserMenu.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/UserMenu.razor
@@ -1,8 +1,4 @@
-@inherits AppComponentBase
-
-@{
-    var imageUrl = user.ProfileImageName is null ? null : $"{profileImageUrl}&file={user.ProfileImageName}";
-}
+@inherits AppComponentBase
 
 <section>
     <BitDropMenu Transparent @bind-IsOpen="isOpen" Responsive
@@ -10,7 +6,7 @@
                  Classes="@(new() { Callout="user-menu-callout" })">
         <Template>
             <BitPersona Class="persona"
-                        ImageUrl="@imageUrl"
+                        ImageUrl="@ProfileImageUrl"
                         Size=@BitPersonaSize.Size32
                         PrimaryText="@user.DisplayName"
                         Classes="@(new() { DetailsContainer="persona-details" })"
@@ -23,7 +19,7 @@
                 {
                     <BitStack AutoSize>
                         <BitPersona Class="persona"
-                                    ImageUrl="@imageUrl"
+                                    ImageUrl="@ProfileImageUrl"
                                     OnImageClick="GoToProfile"
                                     Size="BitPersonaSize.Size48"
                                     PrimaryText="@user.DisplayName"
@@ -40,15 +36,18 @@
                             @Localizer[nameof(AppStrings.ProfileTitle)]
                         </BitActionButton>
 
-                        <BitActionButton IconName="@BitIconName.Globe" FullWidth OnClick="() => showCultures=true">
-                            <BitStack Horizontal Gap="0" Grows VerticalAlign="BitAlignment.Center">
-                                @Localizer[nameof(AppStrings.Language)]
-                                <BitSpacer />
-                                <BitIcon Size="BitSize.Small"
-                                         Color="BitColor.SecondaryForeground"
-                                         IconName="@(currentDir is BitDir.Rtl ? BitIconName.ChevronLeft : BitIconName.ChevronRight)" />
-                            </BitStack>
-                        </BitActionButton>
+                        @if (CultureInfoManager.MultilingualEnabled)
+                        {
+                            <BitActionButton IconName="@BitIconName.Globe" FullWidth OnClick="() => showCultures=true">
+                                <BitStack Horizontal Gap="0" Grows VerticalAlign="BitAlignment.Center">
+                                    @Localizer[nameof(AppStrings.Language)]
+                                    <BitSpacer />
+                                    <BitIcon Size="BitSize.Small"
+                                             Color="BitColor.SecondaryForeground"
+                                             IconName="@(currentDir is BitDir.Rtl ? BitIconName.ChevronLeft : BitIconName.ChevronRight)" />
+                                </BitStack>
+                            </BitActionButton>
+                        }
 
                         <BitStack Horizontal VerticalAlign="BitAlignment.Center" Gap="0">
                             <BitActionButton Style="flex-grow:1"
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/UserMenu.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/UserMenu.razor.cs
index 1686228ba8..e3c702d84b 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/UserMenu.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/UserMenu.razor.cs
@@ -8,7 +8,6 @@ public partial class UserMenu
     private bool isOpen;
     private bool showCultures;
     private UserDto user = new();
-    private string? profileImageUrl;
     private bool isSignOutConfirmOpen;
     private Action unsubscribeUerDataUpdated = default!;
     private BitChoiceGroupItem<string>[] cultures = default!;
@@ -24,6 +23,9 @@ public partial class UserMenu
     [CascadingParameter(Name = Parameters.CurrentTheme)] private AppThemeType? currentTheme { get; set; }
 
 
+    private string? ProfileImageUrl => user.GetProfileImageUrl(AbsoluteServerAddress);
+
+
     protected override async Task OnInitAsync()
     {
         if (CultureInfoManager.MultilingualEnabled)
@@ -44,9 +46,6 @@ protected override async Task OnInitAsync()
 
         user = await userController.GetCurrentUser(CurrentCancellationToken);
 
-        var accessToken = await PrerenderStateService.GetValue(AuthTokenProvider.GetAccessToken);
-        profileImageUrl = new Uri(AbsoluteServerAddress, $"/api/Attachment/GetProfileImage?access_token={accessToken}").ToString();
-
         await base.OnInitAsync();
     }
 
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/ProfileSection.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/ProfileSection.razor
index 6aafb63c6b..653b2de476 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/ProfileSection.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/ProfileSection.razor
@@ -1,9 +1,5 @@
 @inherits AppComponentBase
 
-@{
-    var imageUrl = User?.ProfileImageName is null ? null : $"{profileImageUrl}&file={User.ProfileImageName}";
-}
-
 <section>
     <BitStack HorizontalAlign="BitAlignment.Center">
         @if (Loading)
@@ -32,7 +28,7 @@
                         @if (isUploading is false)
                         {
                             <BitPersona HidePersonaDetails
-                                        ImageUrl="@imageUrl"
+                                        ImageUrl="@ProfileImageUrl"
                                         PrimaryText="@User?.FullName"
                                         Size=@BitPersonaSize.Size72
                                         Presence="@(IsOnline is null ? BitPersonaPresence.None : IsOnline is true ? BitPersonaPresence.Online : BitPersonaPresence.Offline)" />
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/ProfileSection.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/ProfileSection.razor.cs
index 6bc1b0e665..e30f2bfa96 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/ProfileSection.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/ProfileSection.razor.cs
@@ -14,20 +14,18 @@ public partial class ProfileSection
 
     private bool isSaving;
     private bool isUploading;
-    private string? profileImageUrl;
     private string? profileImageUploadUrl;
-    private string? removeProfileImageHttpUrl;
     private BitFileUpload fileUploadRef = default!;
     private readonly EditUserDto editUserDto = new();
 
+    
+    private string? ProfileImageUrl => User?.GetProfileImageUrl(AbsoluteServerAddress);
+
 
     protected override async Task OnInitAsync()
     {
         var accessToken = await PrerenderStateService.GetValue(AuthTokenProvider.GetAccessToken);
 
-        removeProfileImageHttpUrl = $"api/Attachment/RemoveProfileImage?access_token={accessToken}";
-
-        profileImageUrl = new Uri(AbsoluteServerAddress, $"/api/Attachment/GetProfileImage?access_token={accessToken}").ToString();
         profileImageUploadUrl = new Uri(AbsoluteServerAddress, $"/api/Attachment/UploadProfileImage?access_token={accessToken}").ToString();
 
         await base.OnInitAsync();
@@ -74,7 +72,7 @@ private async Task RemoveProfileImage()
 
         try
         {
-            await HttpClient.DeleteAsync(removeProfileImageHttpUrl, CurrentCancellationToken);
+            await HttpClient.DeleteAsync("api/Attachment/RemoveProfileImage", CurrentCancellationToken);
 
             User.ProfileImageName = null;
 
@@ -98,7 +96,7 @@ private async Task HandleOnUploadComplete()
         {
             var updatedUser = await userController.GetCurrentUser(CurrentCancellationToken);
 
-            User.ProfileImageName = updatedUser.ProfileImageName;
+            updatedUser.Patch(User);
 
             PublishUserDataUpdated();
         }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/SettingsPage.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/SettingsPage.razor
index d4dea84563..107d336df7 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/SettingsPage.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/SettingsPage.razor
@@ -6,10 +6,6 @@
 
 <PageTitle>@Localizer[nameof(AppStrings.SettingsPageTitle)]</PageTitle>
 
-@{
-    var imageUrl = user?.ProfileImageName is null ? null : $"{profileImageUrl}&file={user.ProfileImageName}";
-}
-
 <section>
     <BitStack Class="stack">
         <Accordion @bind-Value="@openedAccordion"
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/SettingsPage.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/SettingsPage.razor.cs
index 87eda360e3..a7951460ed 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/SettingsPage.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/SettingsPage.razor.cs
@@ -18,7 +18,6 @@ public partial class SettingsPage
 
     private UserDto? user;
     private bool isLoading;
-    private string? profileImageUrl;
     private string? openedAccordion;
 
 
@@ -30,10 +29,7 @@ protected override async Task OnInitAsync()
 
         try
         {
-            user = user = (await PrerenderStateService.GetValue(() => HttpClient.GetFromJsonAsync("api/User/GetCurrentUser", JsonSerializerOptions.GetTypeInfo<UserDto>(), CurrentCancellationToken)))!;
-
-            var accessToken = await PrerenderStateService.GetValue(AuthTokenProvider.GetAccessToken);
-            profileImageUrl = new Uri(AbsoluteServerAddress, $"/api/Attachment/GetProfileImage?access_token={accessToken}").ToString();
+            user = (await PrerenderStateService.GetValue(() => HttpClient.GetFromJsonAsync("api/User/GetCurrentUser", JsonSerializerOptions.GetTypeInfo<UserDto>(), CurrentCancellationToken)))!;
         }
         finally
         {
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/HomePage.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/HomePage.razor
index b49e8792bf..28f2a88500 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/HomePage.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/HomePage.razor
@@ -23,71 +23,71 @@
                 <BitStack>
                     <BitText Typography="BitTypography.H5">Statistics</BitText>
                     <BitPivot Style="width:100%" Styles="@(new() { Body = "overflow:auto" })">
-                        <BitPivotItem HeaderText="GitHub">
-                            @if (isLoadingGitHub)
+                        <BitPivotItem HeaderText="Nuget">
+                            @if (isLoadingNuget)
                             {
                                 <BitStack HorizontalAlign="BitAlignment.Center">
                                     <BitRippleLoading />
                                 </BitStack>
                             }
-                            else if (gitHubStats is not null)
+                            else if (nugetStats is not null)
                             {
+                                var data = nugetStats.Data[0];
                                 <BitStack>
                                     <BitStack Horizontal>
-                                        <BitText>Name:</BitText>
-                                        <BitText><b>@gitHubStats.Name</b></BitText>
-                                    </BitStack>
-                                    <BitStack Horizontal>
-                                        <BitText>Total stars:</BitText>
-                                        <BitText><b>@gitHubStats.StargazersCount.ToString("N0")</b></BitText>
+                                        <BitText>Package id:</BitText>
+                                        <BitText><b>@data.Id</b></BitText>
                                     </BitStack>
                                     <BitStack Horizontal>
-                                        <BitText>Forks count:</BitText>
-                                        <BitText><b>@gitHubStats.ForksCount.ToString("N0")</b></BitText>
+                                        <BitText>Version:</BitText>
+                                        <BitText><b>@data.Version</b></BitText>
                                     </BitStack>
                                     <BitStack Horizontal>
-                                        <BitText>Repo:</BitText>
-                                        <BitLink Target="_blank"
-                                                 Href="https://github.com/bitfoundation/bitplatform/tree/develop/src/Templates/Boilerplate">
-                                            <BitImage Alt="bitplatform GitHub stars"
-                                                      Src="https://img.shields.io/github/stars/bitfoundation/bitplatform?style=social&label=Github%20%E2%9C%A8" />
-                                        </BitLink>
+                                        <BitText>Total downloads:</BitText>
+                                        <BitText><b>@data.TotalDownloads.ToString("N0")</b></BitText>
                                     </BitStack>
                                 </BitStack>
                             }
                             else
                             {
-                                <BitText Typography="BitTypography.H4">GitHub stats could not be loaded.</BitText>
+                                <BitText Typography="BitTypography.H4">Nuget stats could not be loaded.</BitText>
                             }
                         </BitPivotItem>
-                        <BitPivotItem HeaderText="Nuget">
-                            @if (isLoadingNuget)
+                        <BitPivotItem HeaderText="GitHub">
+                            @if (isLoadingGitHub)
                             {
                                 <BitStack HorizontalAlign="BitAlignment.Center">
                                     <BitRippleLoading />
                                 </BitStack>
                             }
-                            else if (nugetStats is not null)
+                            else if (gitHubStats is not null)
                             {
-                                var data = nugetStats.Data[0];
                                 <BitStack>
                                     <BitStack Horizontal>
-                                        <BitText>Package id:</BitText>
-                                        <BitText><b>@data.Id</b></BitText>
+                                        <BitText>Name:</BitText>
+                                        <BitText><b>@gitHubStats.Name</b></BitText>
                                     </BitStack>
                                     <BitStack Horizontal>
-                                        <BitText>Version:</BitText>
-                                        <BitText><b>@data.Version</b></BitText>
+                                        <BitText>Total stars:</BitText>
+                                        <BitText><b>@gitHubStats.StargazersCount.ToString("N0")</b></BitText>
                                     </BitStack>
                                     <BitStack Horizontal>
-                                        <BitText>Total downloads:</BitText>
-                                        <BitText><b>@data.TotalDownloads.ToString("N0")</b></BitText>
+                                        <BitText>Forks count:</BitText>
+                                        <BitText><b>@gitHubStats.ForksCount.ToString("N0")</b></BitText>
+                                    </BitStack>
+                                    <BitStack Horizontal>
+                                        <BitText>Repo:</BitText>
+                                        <BitLink Target="_blank"
+                                                 Href="https://github.com/bitfoundation/bitplatform/tree/develop/src/Templates/Boilerplate">
+                                            <BitImage Alt="bitplatform GitHub stars"
+                                                      Src="https://img.shields.io/github/stars/bitfoundation/bitplatform?style=social&label=Github%20%E2%9C%A8" />
+                                        </BitLink>
                                     </BitStack>
                                 </BitStack>
                             }
                             else
                             {
-                                <BitText Typography="BitTypography.H4">Nuget stats could not be loaded.</BitText>
+                                <BitText Typography="BitTypography.H4">GitHub stats could not be loaded.</BitText>
                             }
                         </BitPivotItem>
                     </BitPivot>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/HomePage.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/HomePage.razor.cs
index b2846c7c99..39c1c8e227 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/HomePage.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/HomePage.razor.cs
@@ -30,31 +30,41 @@ protected override async Task OnInitAsync()
         // However, the logic in other HTTP message handlers, such as **LoggingDelegatingHandler** and **RetryDelegatingHandler**,
         // effectively addresses most scenarios.
 
-        await Task.WhenAll(LoadGitHub(), LoadNuget());
+        await Task.WhenAll(LoadNuget(), LoadGitHub());
     }
 
-    private async Task LoadGitHub()
+    private async Task LoadNuget()
     {
         try
         {
-            gitHubStats = await statisticsController.GetGitHubStats(CurrentCancellationToken);
+            nugetStats = await statisticsController.GetNugetStats(packageId: "Bit.BlazorUI", CurrentCancellationToken);
         }
         finally
         {
-            isLoadingGitHub = false;
+            isLoadingNuget = false;
             await InvokeAsync(StateHasChanged);
         }
     }
 
-    private async Task LoadNuget()
+    private async Task LoadGitHub()
     {
         try
         {
-            nugetStats = await statisticsController.GetNugetStats(packageId: "Bit.BlazorUI", CurrentCancellationToken);
+            // GitHub results (2nd Bit Pivot tab) aren't shown by default and aren't critical for SEO,
+            // so we can skip it in pre-rendering to save time.
+            if (InPrerenderSession is false)
+            {
+                gitHubStats = await statisticsController.GetGitHubStats(CurrentCancellationToken);
+            }
+        }
+        catch
+        {
+            // GetGitHubStats method calls the GitHub API directly from the client.
+            // We've intentionally ignored proper exception handling to keep this example simple. 
         }
         finally
         {
-            isLoadingNuget = false;
+            isLoadingGitHub = false;
             await InvokeAsync(StateHasChanged);
         }
     }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/CompiledModel/OfflineDbContextModelBuilder.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/CompiledModel/OfflineDbContextModelBuilder.cs
index b2282d4809..74fbd1ea77 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/CompiledModel/OfflineDbContextModelBuilder.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/CompiledModel/OfflineDbContextModelBuilder.cs
@@ -11,7 +11,7 @@ namespace Boilerplate.Client.Core.Data
     public partial class OfflineDbContextModel
     {
         private OfflineDbContextModel()
-            : base(skipDetectChanges: false, modelId: new Guid("b97b95bd-89b9-4be0-a574-d2035391c0c8"), entityTypeCount: 1)
+            : base(skipDetectChanges: false, modelId: new Guid("4b5524a2-4b87-4b64-9e87-fe2649512808"), entityTypeCount: 1)
         {
         }
 
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/CompiledModel/UserDtoEntityType.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/CompiledModel/UserDtoEntityType.cs
index a898c0d728..900acaf46f 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/CompiledModel/UserDtoEntityType.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/CompiledModel/UserDtoEntityType.cs
@@ -21,7 +21,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
                 "Boilerplate.Shared.Dtos.Identity.UserDto",
                 typeof(UserDto),
                 baseEntityType,
-                propertyCount: 9,
+                propertyCount: 10,
                 keyCount: 1);
 
             var id = runtimeEntityType.AddProperty(
@@ -41,6 +41,13 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
                 nullable: true,
                 valueConverter: new DateTimeOffsetToBinaryConverter());
 
+            var concurrencyStamp = runtimeEntityType.AddProperty(
+                "ConcurrencyStamp",
+                typeof(string),
+                propertyInfo: typeof(UserDto).GetProperty("ConcurrencyStamp", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(UserDto).GetField("<ConcurrencyStamp>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
             var email = runtimeEntityType.AddProperty(
                 "Email",
                 typeof(string),
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/Migrations/20241030140343_InitialMigration.Designer.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/Migrations/20241220023903_InitialMigration.Designer.cs
similarity index 89%
rename from src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/Migrations/20241030140343_InitialMigration.Designer.cs
rename to src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/Migrations/20241220023903_InitialMigration.Designer.cs
index 27ff3c7e8a..e979161ffb 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/Migrations/20241030140343_InitialMigration.Designer.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/Migrations/20241220023903_InitialMigration.Designer.cs
@@ -1,14 +1,17 @@
 // <auto-generated />
+using System;
+using Boilerplate.Client.Core.Data;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 #nullable disable
 
 namespace Boilerplate.Client.Core.Data.Migrations;
 
 [DbContext(typeof(OfflineDbContext))]
-[Migration("20241030140343_InitialMigration")]
+[Migration("20241220023903_InitialMigration")]
 partial class InitialMigration
 {
     /// <inheritdoc />
@@ -26,6 +29,9 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                 b.Property<long?>("BirthDate")
                     .HasColumnType("INTEGER");
 
+                b.Property<string>("ConcurrencyStamp")
+                    .HasColumnType("TEXT");
+
                 b.Property<string>("Email")
                     .HasColumnType("TEXT");
 
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/Migrations/20241030140343_InitialMigration.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/Migrations/20241220023903_InitialMigration.cs
similarity index 80%
rename from src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/Migrations/20241030140343_InitialMigration.cs
rename to src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/Migrations/20241220023903_InitialMigration.cs
index d859fcd8ef..4f639baf26 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/Migrations/20241030140343_InitialMigration.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/Migrations/20241220023903_InitialMigration.cs
@@ -23,7 +23,8 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 FullName = table.Column<string>(type: "TEXT", nullable: false),
                 Gender = table.Column<int>(type: "INTEGER", nullable: true),
                 BirthDate = table.Column<long>(type: "INTEGER", nullable: true),
-                ProfileImageName = table.Column<string>(type: "TEXT", nullable: true)
+                ProfileImageName = table.Column<string>(type: "TEXT", nullable: true),
+                ConcurrencyStamp = table.Column<string>(type: "TEXT", nullable: true)
             },
             constraints: table =>
             {
@@ -32,8 +33,8 @@ protected override void Up(MigrationBuilder migrationBuilder)
 
         migrationBuilder.InsertData(
             table: "Users",
-            columns: new[] { "Id", "BirthDate", "Email", "FullName", "Gender", "Password", "PhoneNumber", "ProfileImageName", "UserName" },
-            values: new object[] { new Guid("8ff71671-a1d6-4f97-abb9-d87d7b47d6e7"), 1306790461440000000L, "test@bitplatform.dev", "Boilerplate test account", 0, "123456", "+31684207362", null, "test" });
+            columns: new[] { "Id", "BirthDate", "ConcurrencyStamp", "Email", "FullName", "Gender", "Password", "PhoneNumber", "ProfileImageName", "UserName" },
+            values: new object[] { new Guid("8ff71671-a1d6-4f97-abb9-d87d7b47d6e7"), 1306790461440000000L, null, "test@bitplatform.dev", "Boilerplate test account", 0, "123456", "+31684207362", null, "test" });
     }
 
     /// <inheritdoc />
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/Migrations/OfflineDbContextModelSnapshot.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/Migrations/OfflineDbContextModelSnapshot.cs
index f277e593fa..02fc2c8a62 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/Migrations/OfflineDbContextModelSnapshot.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/Migrations/OfflineDbContextModelSnapshot.cs
@@ -1,6 +1,9 @@
 // <auto-generated />
+using System;
+using Boilerplate.Client.Core.Data;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 #nullable disable
 
@@ -23,6 +26,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                 b.Property<long?>("BirthDate")
                     .HasColumnType("INTEGER");
 
+                b.Property<string>("ConcurrencyStamp")
+                    .HasColumnType("TEXT");
+
                 b.Property<string>("Email")
                     .HasColumnType("TEXT");
 
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/AttachmentController.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/AttachmentController.cs
index f5ec34cbf0..7a409cf620 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/AttachmentController.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/AttachmentController.cs
@@ -10,8 +10,6 @@ public partial class AttachmentController : AppControllerBase
 {
     [AutoInject] private UserManager<User> userManager = default!;
 
-    [AutoInject] private IWebHostEnvironment webHostEnvironment = default!;
-
     [AutoInject] private IBlobStorage blobStorage = default!;
 
     [HttpPost]
@@ -91,11 +89,11 @@ public async Task RemoveProfileImage(CancellationToken cancellationToken)
         await blobStorage.DeleteAsync(filePath, cancellationToken);
     }
 
-    [HttpGet]
-    public async Task<IActionResult> GetProfileImage(CancellationToken cancellationToken)
+    [AllowAnonymous]
+    [HttpGet("{userId}")]
+    [ResponseCache(Duration = 7 * 24 * 3600, Location = ResponseCacheLocation.Any, VaryByQueryKeys = new string[] { "*" })]
+    public async Task<IActionResult> GetProfileImage(Guid userId, CancellationToken cancellationToken)
     {
-        var userId = User.GetUserId();
-
         var user = await userManager.FindByIdAsync(userId.ToString());
 
         if (user?.ProfileImageName is null)
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Statistics/StatisticsController.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Statistics/StatisticsController.cs
index 9cbba4b900..2801488586 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Statistics/StatisticsController.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Statistics/StatisticsController.cs
@@ -11,7 +11,7 @@ public partial class StatisticsController : AppControllerBase, IStatisticsContro
 
     [AllowAnonymous]
     [HttpGet("{packageId}")]
-    [ResponseCache(Duration = 1 * 24 * 3600, Location = ResponseCacheLocation.Any)]
+    [ResponseCache(Duration = 1 * 24 * 3600, Location = ResponseCacheLocation.Any, VaryByQueryKeys = new string[] { "*" })]
     public async Task<NugetStatsDto> GetNugetStats(string packageId, CancellationToken cancellationToken)
     {
         return await nugetHttpClient.GetPackageStats(packageId, cancellationToken);
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Dtos/Identity/UserDto.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Dtos/Identity/UserDto.cs
index b19cfc4f7c..64f7c06cd2 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Dtos/Identity/UserDto.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Dtos/Identity/UserDto.cs
@@ -33,8 +33,17 @@ public partial class UserDto : IValidatableObject
 
     public string? ProfileImageName { get; set; }
 
+    public string? ConcurrencyStamp { get; set; }
+
     public string? DisplayName => FullName ?? Email ?? PhoneNumber ?? UserName;
 
+    public string? GetProfileImageUrl(Uri absoluteServerAddress)
+    {
+        return ProfileImageName is null
+            ? null
+            : new Uri(absoluteServerAddress, $"/api/Attachment/GetProfileImage/{Id}?v={ConcurrencyStamp}").ToString();
+    }
+
     public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
     {
         if (string.IsNullOrEmpty(Email) && string.IsNullOrEmpty(PhoneNumber))
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Extensions/ByteArrayExtensions.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Extensions/ByteArrayExtensions.cs
similarity index 94%
rename from src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Extensions/ByteArrayExtensions.cs
rename to src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Extensions/ByteArrayExtensions.cs
index d84ee60dd2..e06ba87cd9 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Extensions/ByteArrayExtensions.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Extensions/ByteArrayExtensions.cs
@@ -5,7 +5,9 @@ public static class ByteArrayExtensions
     public static string ToStampString(this byte[]? source)
     {
         if (source is null or { Length: 0 })
+        {
             source = [0, 0, 0, 0, 0, 0, 0, 0];
+        }
 
         var base64String = Convert.ToBase64String(source);