diff --git a/PlexRequests.UI/Modules/BaseAuthModule.cs b/PlexRequests.UI/Modules/BaseAuthModule.cs
index d5dde01c9..d3d3de5d9 100644
--- a/PlexRequests.UI/Modules/BaseAuthModule.cs
+++ b/PlexRequests.UI/Modules/BaseAuthModule.cs
@@ -53,14 +53,15 @@ namespace PlexRequests.UI.Modules
         private Response CheckAuth()
         {
             var settings = PlexRequestSettings.GetSettings();
+            
+            var baseUrl = settings.BaseUrl;
+            
             // Have we been through the wizard?
             if (!settings.Wizard)
             {
-                return Context.GetRedirect("~/wizard");
+                return Context.GetRedirect(string.IsNullOrEmpty(baseUrl) ? "~/wizard" : $"~/{baseUrl}/wizard");
             }
 
-            var baseUrl = settings.BaseUrl;
-
             var redirectPath = string.IsNullOrEmpty(baseUrl) ? "~/userlogin" : $"~/{baseUrl}/userlogin";
 
             return Session[SessionKeys.UsernameKey] == null
@@ -68,4 +69,4 @@ namespace PlexRequests.UI.Modules
                 : null;
         }
     }
-}
\ No newline at end of file
+}