diff --git a/Ombi.UI/Modules/UserLoginModule.cs b/Ombi.UI/Modules/UserLoginModule.cs
index e85c5827e..434892496 100644
--- a/Ombi.UI/Modules/UserLoginModule.cs
+++ b/Ombi.UI/Modules/UserLoginModule.cs
@@ -69,49 +69,49 @@ namespace Ombi.UI.Modules
             CustomUserMapper = custom;
             UserManagementSettings = userManagementSettings;
 
-            Get["UserLoginIndex", "/", true] = async (x, ct) =>
-            {
-                if (Request.Query["landing"] == null)
-                {
-                    var s = await LandingPageSettings.GetSettingsAsync();
-                    if (s.Enabled)
-                    {
-                        if (s.BeforeLogin) // Before login
-                        {
-                            if (string.IsNullOrEmpty(Username))
-                            {
-                                // They are not logged in
-                                return
-                                    Context.GetRedirect(Linker.BuildRelativeUri(Context, "LandingPageIndex").ToString());
-                            }
-                            return Context.GetRedirect(Linker.BuildRelativeUri(Context, "SearchIndex").ToString());
-                        }
+            //Get["UserLoginIndex", "/", true] = async (x, ct) =>
+            //{
+            //    if (Request.Query["landing"] == null)
+            //    {
+            //        var s = await LandingPageSettings.GetSettingsAsync();
+            //        if (s.Enabled)
+            //        {
+            //            if (s.BeforeLogin) // Before login
+            //            {
+            //                if (string.IsNullOrEmpty(Username))
+            //                {
+            //                    // They are not logged in
+            //                    return
+            //                        Context.GetRedirect(Linker.BuildRelativeUri(Context, "LandingPageIndex").ToString());
+            //                }
+            //                return Context.GetRedirect(Linker.BuildRelativeUri(Context, "SearchIndex").ToString());
+            //            }
 
-                        // After login
-                        if (string.IsNullOrEmpty(Username))
-                        {
-                            // Not logged in yet
-                            return Context.GetRedirect(Linker.BuildRelativeUri(Context, "UserLoginIndex").ToString() + "?landing");
-                        }
-                        // Send them to landing
-                        var landingUrl = Linker.BuildRelativeUri(Context, "LandingPageIndex").ToString();
-                        return Context.GetRedirect(landingUrl);
-                    }
-                }
+            //            // After login
+            //            if (string.IsNullOrEmpty(Username))
+            //            {
+            //                // Not logged in yet
+            //                return Context.GetRedirect(Linker.BuildRelativeUri(Context, "UserLoginIndex").ToString() + "?landing");
+            //            }
+            //            // Send them to landing
+            //            var landingUrl = Linker.BuildRelativeUri(Context, "LandingPageIndex").ToString();
+            //            return Context.GetRedirect(landingUrl);
+            //        }
+            //    }
 
-                if (!string.IsNullOrEmpty(Username) || IsAdmin)
-                {
-                    var url = Linker.BuildRelativeUri(Context, "SearchIndex").ToString();
-                    return Response.AsRedirect(url);
-                }
-                var settings = await AuthService.GetSettingsAsync();
-                return View["Index", settings];
-            };
+            //    if (!string.IsNullOrEmpty(Username) || IsAdmin)
+            //    {
+            //        var url = Linker.BuildRelativeUri(Context, "SearchIndex").ToString();
+            //        return Response.AsRedirect(url);
+            //    }
+            //    var settings = await AuthService.GetSettingsAsync();
+            //    return View["Index", settings];
+            //};
 
             Post["/", true] = async (x, ct) => await LoginUser();
             Get["/logout"] = x => Logout();
 
-            Get["UserLoginUsernameIndex", "/login", true] = async (x, ct) =>
+            Get["UserLoginIndex", "/", true] = async (x, ct) =>
             {
                 if (Request.Query["landing"] == null)
                 {
@@ -133,7 +133,7 @@ namespace Ombi.UI.Modules
                         if (string.IsNullOrEmpty(Username))
                         {
                             // Not logged in yet
-                            return Context.GetRedirect(Linker.BuildRelativeUri(Context, "UserLoginUsernameIndex").ToString() + "?landing");
+                            return Context.GetRedirect(Linker.BuildRelativeUri(Context, "UserLoginIndex").ToString() + "?landing");
                         }
                         // Send them to landing
                         var landingUrl = Linker.BuildRelativeUri(Context, "LandingPageIndex").ToString();
@@ -215,7 +215,7 @@ namespace Ombi.UI.Modules
                 authenticated = true;
             }
 
-            if (settings.UsePassword || isOwner)
+            if (settings.UsePassword || isOwner || Security.HasPermissions(username, Permissions.Administrator))
             {
                 Session[SessionKeys.UserLoginName] = username;
 
diff --git a/Ombi.UI/Views/UserLogin/Password.cshtml b/Ombi.UI/Views/UserLogin/Password.cshtml
index f4e3255b7..39c9f4923 100644
--- a/Ombi.UI/Views/UserLogin/Password.cshtml
+++ b/Ombi.UI/Views/UserLogin/Password.cshtml
@@ -1,5 +1,4 @@
     <form method="POST" id="passwordForm">
-        <input id="dateTimeOffset" name="DateTimeOffset" hidden="hidden" />
 
         <div>
             <div>
diff --git a/Ombi.UI/Views/UserLogin/Username.cshtml b/Ombi.UI/Views/UserLogin/Username.cshtml
index 441f8a056..d90b42607 100644
--- a/Ombi.UI/Views/UserLogin/Username.cshtml
+++ b/Ombi.UI/Views/UserLogin/Username.cshtml
@@ -24,6 +24,7 @@
             <button id="loginBtn" class="btn btn-success-outline" type="submit"><i class="fa fa-user fa-fw"></i> @UI.UserLogin_SignIn</button>
         </form>
     </div>
+    <div id="contentBody2"></div>
 </div>
 
 <script>
@@ -49,7 +50,7 @@
 
                             return $('#dateTimeOffset').val(new Date().getTimezoneOffset());
                         } else {
-                            return window.location.replace(response.url);
+                            return window.location.replace(response.url); // This is probably not uses, it probably goes into the error callback
                         }
                     } else if (response.responseText) {
                        return  $('#htmlId').html(response.responseText);
@@ -71,7 +72,7 @@
         });
 
 
-        $('#contentBody').on('click', '#passwordBtn', function (e) {
+        $('#contentBody, #contentBody2').on('click', '#passwordBtn', function (e) {
             e.preventDefault();
 
             var url = createBaseUrl(base, '/userlogin/password');
@@ -103,8 +104,13 @@
 
         function loadArea(html) {
             var $body = $('#contentBody');
+            var $body2 = $('#contentBody2');
+            $body2.slideUp();
             // Do some sliding?
-            $body.html(html);
+            $body.fadeOut();
+            $body2.html(html);
+            $body2.fadeIn();
+            $body.html("");
         }