diff --git a/Oqtane.Client/Themes/Controls/Theme/UserProfile.razor b/Oqtane.Client/Themes/Controls/Theme/UserProfile.razor
index 69abd0e8..f4a2130b 100644
--- a/Oqtane.Client/Themes/Controls/Theme/UserProfile.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/UserProfile.razor
@@ -31,7 +31,16 @@
 
     protected override void OnParametersSet()
     {
-        _returnurl = WebUtility.UrlEncode(PageState.Route.PathAndQuery);
+		if (!PageState.QueryString.ContainsKey("returnurl"))
+		{
+			// remember current url
+			_returnurl += WebUtility.UrlEncode(PageState.Route.PathAndQuery);
+		}
+		else
+		{
+			// use existing value
+			_returnurl += PageState.QueryString["returnurl"];
+		}
     }
 }