diff --git a/Controllers/AccountController.cs b/Controllers/AccountController.cs
index cbd42ee..a733e64 100644
--- a/Controllers/AccountController.cs
+++ b/Controllers/AccountController.cs
@@ -49,7 +49,15 @@ namespace QRRapidoApp.Controllers
         [HttpGet]
         public IActionResult LoginMicrosoft(string returnUrl = "/")
         {
-            var redirectUrl = Url.Action("MicrosoftCallback", "Account", new { returnUrl });
+            var baseUrl = _configuration.GetSection("App:BaseUrl").Value;
+            //var redirectUrl = Url.Action("MicrosoftCallback", "Account", new { returnUrl });
+            var redirectUrl = "";
+
+            if (returnUrl == "/")
+            {
+                redirectUrl = $"{baseUrl}/Account/MicrosoftCallback"; 
+            }
+
             var properties = new AuthenticationProperties { RedirectUri = redirectUrl };
             return Challenge(properties, MicrosoftAccountDefaults.AuthenticationScheme);
         }