diff --git a/Clinically.Kinde.Authentication.csproj b/Clinically.Kinde.Authentication.csproj
index c132cf4..8bcdbbe 100644
--- a/Clinically.Kinde.Authentication.csproj
+++ b/Clinically.Kinde.Authentication.csproj
@@ -9,7 +9,7 @@
         <RepositoryType>git</RepositoryType>
         <PackageProjectUrl>https://github.com/clinically-au/kinde-authentication</PackageProjectUrl>
         <AssemblyName>Clinically.Kinde.Authentication</AssemblyName>
-        <Version>1.2.2</Version>
+        <Version>1.2.3</Version>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <RootNamespace>Clinically.Kinde.Authentication</RootNamespace>
         <PackageId>Clinically.Kinde.Authentication</PackageId>
diff --git a/Identity/KindeIdentityEndpointRouteBuilderExtensions.cs b/Identity/KindeIdentityEndpointRouteBuilderExtensions.cs
index 8c5c32c..c30e335 100644
--- a/Identity/KindeIdentityEndpointRouteBuilderExtensions.cs
+++ b/Identity/KindeIdentityEndpointRouteBuilderExtensions.cs
@@ -42,10 +42,12 @@ public static IEndpointConventionBuilder MapKindeIdentityEndpoints(this IEndpoin
         accountGroup.MapGet("/LoginCallback",
             new Func<HttpContext, SignInManager<KindeUser>, string?, string?, Task<RedirectHttpResult>>(async (context,
                 [FromServices] signInManager,
-                [FromQuery] ReturnUrl,
-                [FromQuery] RemoteError) =>
+                [FromQuery] returnUrl,
+                [FromQuery] remoteError) =>
             {
-                if (RemoteError is not null)
+                ArgumentException.ThrowIfNullOrEmpty(returnUrl);
+                
+                if (remoteError is not null)
                 {
                     return TypedResults.Redirect("/Error");
                 }
@@ -64,7 +66,7 @@ await signInManager.ExternalLoginSignInAsync(info.LoginProvider, info.ProviderKe
                     return TypedResults.Redirect("/Error");
                 }
 
-                return TypedResults.Redirect(ReturnUrl);
+                return TypedResults.Redirect(returnUrl);
             }));
 
         accountGroup.MapPost("/Logout", async (
@@ -74,9 +76,9 @@ await signInManager.ExternalLoginSignInAsync(info.LoginProvider, info.ProviderKe
             [FromForm] string returnUrl) =>
         {
             await signInManager.SignOutAsync();
-            var authority = config.GetRequiredSection("Kinde:Authority").Value;
-            var baseUrl = config.GetRequiredSection("AppConfig:BaseUrl").Value ?? string.Empty;
-            var logoutUri = $"{authority}/logout?redirect={Uri.EscapeDataString(baseUrl)}";
+            var authority = config.GetRequiredSection("Kinde:Domain").Value;
+            var baseUrl = config.GetRequiredSection("AppConfig:BaseUrl").Value;
+            var logoutUri = $"{authority}/logout?redirect={Uri.EscapeDataString(baseUrl!)}";
             return TypedResults.Redirect(logoutUri);
         });