diff --git a/MediaBrowser.Api/HttpHandlers/UserAuthenticationHandler.cs b/MediaBrowser.Api/HttpHandlers/UserAuthenticationHandler.cs
index ed588e7762..86f3c477a0 100644
--- a/MediaBrowser.Api/HttpHandlers/UserAuthenticationHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/UserAuthenticationHandler.cs
@@ -17,12 +17,10 @@ namespace MediaBrowser.Api.HttpHandlers
 
             string password = await GetFormValue("password").ConfigureAwait(false);
 
-            AuthenticationResult result = new AuthenticationResult()
+            return new AuthenticationResult()
             {
                 Success = true
-            };
-
-            return result;
+            }; 
         }
     }
 }
diff --git a/MediaBrowser.ApiInteraction/ApiClient.cs b/MediaBrowser.ApiInteraction/ApiClient.cs
index ca53c66fcd..46ef26c7e4 100644
--- a/MediaBrowser.ApiInteraction/ApiClient.cs
+++ b/MediaBrowser.ApiInteraction/ApiClient.cs
@@ -652,7 +652,7 @@ namespace MediaBrowser.ApiInteraction
         /// <summary>
         /// Authenticates a user and returns the result
         /// </summary>
-        public async Task<AuthenticationResult> AuthenticateUser(Guid userId, string password)
+        public async Task<AuthenticationResult> AuthenticateUserAsync(Guid userId, string password)
         {
             string url = ApiUrl + "/UserAuthentication?dataformat=" + SerializationFormat.ToString();