diff --git a/Emby.Server.Implementations/Library/InvalidAuthProvider.cs b/Emby.Server.Implementations/Library/InvalidAuthProvider.cs
index ee25695621..133864708d 100644
--- a/Emby.Server.Implementations/Library/InvalidAuthProvider.cs
+++ b/Emby.Server.Implementations/Library/InvalidAuthProvider.cs
@@ -9,7 +9,7 @@ namespace Emby.Server.Implementations.Library
 {
     public class InvalidAuthProvider : IAuthenticationProvider
     {
-        public string Name => "InvalidorMissingAuthenticationProvider";
+        public string Name => "InvalidOrMissingAuthenticationProvider";
 
         public bool IsEnabled => true;
 
@@ -25,7 +25,7 @@ namespace Emby.Server.Implementations.Library
 
         public Task ChangePassword(User user, string newPassword)
         {
-            return Task.FromResult(true);
+            return Task.CompletedTask;
         }
 
         public void ChangeEasyPassword(User user, string newPassword, string newPasswordHash)
@@ -35,12 +35,12 @@ namespace Emby.Server.Implementations.Library
 
         public string GetPasswordHash(User user)
         {
-            return "";
+            return string.Empty;
         }
 
         public string GetEasyPasswordHash(User user)
         {
-            return "";
+            return string.Empty;
         }
     }
 }
diff --git a/Emby.Server.Implementations/Library/UserManager.cs b/Emby.Server.Implementations/Library/UserManager.cs
index 83584acf3d..04abfc3156 100644
--- a/Emby.Server.Implementations/Library/UserManager.cs
+++ b/Emby.Server.Implementations/Library/UserManager.cs
@@ -313,8 +313,7 @@ namespace Emby.Server.Implementations.Library
 
                     if (authenticationProvider.GetType() != typeof(InvalidAuthProvider))
                     {
-                        var hasNewUserPolicy = authenticationProvider as IHasNewUserPolicy;
-                        if (hasNewUserPolicy != null)
+                        if (authenticationProvider is IHasNewUserPolicy hasNewUserPolicy)
                         {
                             var policy = hasNewUserPolicy.GetNewUserPolicy();
                             UpdateUserPolicy(user, policy, true);
@@ -408,7 +407,7 @@ namespace Emby.Server.Implementations.Library
             if (providers.Length == 0)
             {
                 // Assign the user to the InvalidAuthProvider since no configured auth provider was valid/found
-                _logger.LogWarning("User {0} was found with invalid/missing Authentication Provider {1}. Assigning user to InvalidAuthProvider until this is corrected", user.Name, user.Policy.AuthenticationProviderId);
+                _logger.LogWarning("User {UserName} was found with invalid/missing Authentication Provider {AuthenticationProviderId}. Assigning user to InvalidAuthProvider until this is corrected", user.Name, user.Policy.AuthenticationProviderId);
                 providers = new IAuthenticationProvider[] { _invalidAuthProvider };
             }