diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Layout/LanguageControls.razor b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Layout/LanguageControls.razor
index 3603dbff..c55da3d3 100644
--- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Layout/LanguageControls.razor
+++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Layout/LanguageControls.razor
@@ -80,7 +80,7 @@
         _selected = option;
         _isOpen = false;
         await LocalizationService.SetLanguageAsync(option.Code);
-        Navigation.NavigateTo(Navigation.Uri, forceLoad: true);
+        Navigation.NavigateTo(Navigation.Uri, forceLoad: false);
     }
 
     private sealed record LanguageOption(string Code, string FlagClass, string ShortName);
diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/EnvelopeSenderPage.razor b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/EnvelopeSenderPage.razor
index fdfbd7e0..f18ed8d7 100644
--- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/EnvelopeSenderPage.razor
+++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/EnvelopeSenderPage.razor
@@ -760,7 +760,7 @@
         await InvokeAsync(StateHasChanged);
         UserPreferencesService.InvalidateCache();
         await AuthService.LogoutSenderAsync();
-        Navigation.NavigateTo("/sender/login", forceLoad: true);
+        Navigation.NavigateTo("/sender/login", forceLoad: false);
     }
 
     bool IsEnvelopeSent(EnvelopeDto envelope)
diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/LoginReceiverPage.razor b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/LoginReceiverPage.razor
index e224b406..bebc8e5a 100644
--- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/LoginReceiverPage.razor
+++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/LoginReceiverPage.razor
@@ -170,7 +170,7 @@
 
         if (result == EnvelopeLoginResult.Success)
         {
-            Navigation.NavigateTo($"/envelope/{Uri.EscapeDataString(EnvelopeKey)}", forceLoad: true);
+            Navigation.NavigateTo($"/envelope/{Uri.EscapeDataString(EnvelopeKey)}", forceLoad: false);
             return;
         }
 
diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/LoginSenderPage.razor b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/LoginSenderPage.razor
index d6affc7f..58a67b93 100644
--- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/LoginSenderPage.razor
+++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/LoginSenderPage.razor
@@ -162,7 +162,7 @@
         var result = await AuthService.LoginSenderAsync(Username.Trim(), Password.Trim());
 
         if (result == SenderLoginResult.Success) {
-            Navigation.NavigateTo("/sender", forceLoad: true);
+            Navigation.NavigateTo("/sender", forceLoad: false);
             return;
         }