diff --git a/MediaBrowser.Api/Images/ImageService.cs b/MediaBrowser.Api/Images/ImageService.cs
index 8c6cc0a18e..b8ea621375 100644
--- a/MediaBrowser.Api/Images/ImageService.cs
+++ b/MediaBrowser.Api/Images/ImageService.cs
@@ -675,10 +675,18 @@ namespace MediaBrowser.Api.Images
 
         private ImageFormat[] GetClientSupportedFormats()
         {
-            if ((Request.AcceptTypes ?? new string[] { }).Contains("image/webp", StringComparer.OrdinalIgnoreCase))
-            {
-                var userAgent = Request.UserAgent ?? string.Empty;
+            var supportsWebP = (Request.AcceptTypes ?? new string[] {}).Contains("image/webp", StringComparer.OrdinalIgnoreCase);
 
+            var userAgent = Request.UserAgent ?? string.Empty;
+
+            if (userAgent.IndexOf("crosswalk", StringComparison.OrdinalIgnoreCase) != -1 &&
+                userAgent.IndexOf("android", StringComparison.OrdinalIgnoreCase) != -1)
+            {
+                supportsWebP = true;
+            }
+
+            if (supportsWebP)
+            {
                 // Not displaying properly on iOS
                 if (userAgent.IndexOf("cfnetwork", StringComparison.OrdinalIgnoreCase) == -1)
                 {
diff --git a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
index 048287faa4..4569503c01 100644
--- a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
+++ b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
@@ -376,6 +376,11 @@ namespace MediaBrowser.Server.Implementations.Connect
 
         public async Task<UserLinkResult> LinkUser(string userId, string connectUsername)
         {
+            if (string.IsNullOrWhiteSpace(ConnectServerId))
+            {
+                await UpdateConnectInfo().ConfigureAwait(false);
+            }
+            
             await _operationLock.WaitAsync().ConfigureAwait(false);
 
             try
@@ -399,10 +404,6 @@ namespace MediaBrowser.Server.Implementations.Connect
                 throw new ArgumentNullException("connectUsername");
             }
             if (string.IsNullOrWhiteSpace(ConnectServerId))
-            {
-                await UpdateConnectInfo().ConfigureAwait(false);
-            }
-            if (string.IsNullOrWhiteSpace(ConnectServerId))
             {
                 throw new ArgumentNullException("ConnectServerId");
             }
@@ -474,6 +475,11 @@ namespace MediaBrowser.Server.Implementations.Connect
 
         public async Task<UserLinkResult> InviteUser(ConnectAuthorizationRequest request)
         {
+            if (string.IsNullOrWhiteSpace(ConnectServerId))
+            {
+                await UpdateConnectInfo().ConfigureAwait(false);
+            }
+            
             await _operationLock.WaitAsync().ConfigureAwait(false);
 
             try
@@ -496,10 +502,6 @@ namespace MediaBrowser.Server.Implementations.Connect
                 throw new ArgumentNullException("connectUsername");
             }
             if (string.IsNullOrWhiteSpace(ConnectServerId))
-            {
-                await UpdateConnectInfo().ConfigureAwait(false);
-            }
-            if (string.IsNullOrWhiteSpace(ConnectServerId))
             {
                 throw new ArgumentNullException("ConnectServerId");
             }