diff --git a/Ombi.Api/PlexApi.cs b/Ombi.Api/PlexApi.cs
index 85e96ea68..8e598d965 100644
--- a/Ombi.Api/PlexApi.cs
+++ b/Ombi.Api/PlexApi.cs
@@ -77,8 +77,7 @@ namespace Ombi.Api
 
             request.AddJsonBody(userModel);
 
-			var obj = RetryHandler.Execute<PlexAuthentication>(() => Api.Execute<PlexAuthentication> (request, new Uri(SignInUri)),
-				(exception, timespan) => Log.Error (exception, "Exception when calling SignIn for Plex, Retrying {0}", timespan));
+			var obj =  Api.Execute<PlexAuthentication> (request, new Uri(SignInUri));
 			
 			return obj;
         }
diff --git a/Ombi.UI/Modules/Admin/AdminModule.cs b/Ombi.UI/Modules/Admin/AdminModule.cs
index 72f60612e..f3c8acb8a 100644
--- a/Ombi.UI/Modules/Admin/AdminModule.cs
+++ b/Ombi.UI/Modules/Admin/AdminModule.cs
@@ -520,14 +520,14 @@ namespace Ombi.UI.Modules.Admin
                             Message = "Plex is enabled, we cannot enable Plex and Emby"
                         });
                 }
-            }
 
-            // Get the users
-            var users = EmbyApi.GetUsers(emby.FullUri, emby.ApiKey);
-            // Find admin
-            var admin = users.FirstOrDefault(x => x.Policy.IsAdministrator);
-            emby.AdministratorId = admin?.Id;
 
+                // Get the users
+                var users = EmbyApi.GetUsers(emby.FullUri, emby.ApiKey);
+                // Find admin
+                var admin = users.FirstOrDefault(x => x.Policy.IsAdministrator);
+                emby.AdministratorId = admin?.Id;
+            }
             var result = await EmbySettings.SaveSettingsAsync(emby);
 
             return Response.AsJson(result
diff --git a/Ombi.UI/Modules/UserLoginModule.cs b/Ombi.UI/Modules/UserLoginModule.cs
index a8df7b990..0e0bdef12 100644
--- a/Ombi.UI/Modules/UserLoginModule.cs
+++ b/Ombi.UI/Modules/UserLoginModule.cs
@@ -165,20 +165,27 @@ namespace Ombi.UI.Modules
             {
                 if (settings.UserAuthentication) // Check against the users in Plex
                 {
-                    Log.Debug("Need to auth");
-                    authenticated = CheckIfUserIsInPlexFriends(username, plexSettings.PlexAuthToken);
-                    if (authenticated)
+                    try
                     {
-                        userId = GetUserIdIsInPlexFriends(username, plexSettings.PlexAuthToken);
+                        Log.Debug("Need to auth");
+                        authenticated = CheckIfUserIsInPlexFriends(username, plexSettings.PlexAuthToken);
+                        if (authenticated)
+                        {
+                            userId = GetUserIdIsInPlexFriends(username, plexSettings.PlexAuthToken);
+                        }
+                        if (CheckIfUserIsOwner(plexSettings.PlexAuthToken, username))
+                        {
+                            Log.Debug("User is the account owner");
+                            authenticated = true;
+                            isOwner = true;
+                            userId = GetOwnerId(plexSettings.PlexAuthToken, username);
+                        }
+                        Log.Debug("Friends list result = {0}", authenticated);
                     }
-                    if (CheckIfUserIsOwner(plexSettings.PlexAuthToken, username))
+                    catch (Exception)
                     {
-                        Log.Debug("User is the account owner");
-                        authenticated = true;
-                        isOwner = true;
-                        userId = GetOwnerId(plexSettings.PlexAuthToken, username);
+                        return Response.AsJson(new {result = false, message = Resources.UI.UserLogin_IncorrectUserPass});
                     }
-                    Log.Debug("Friends list result = {0}", authenticated);
                 }
                 else if (!settings.UserAuthentication) // No auth, let them pass!
                 {
diff --git a/Ombi.UI/Views/SystemStatus/Status.cshtml b/Ombi.UI/Views/SystemStatus/Status.cshtml
index c7955e00c..00c625b86 100644
--- a/Ombi.UI/Views/SystemStatus/Status.cshtml
+++ b/Ombi.UI/Views/SystemStatus/Status.cshtml
@@ -57,11 +57,11 @@
                         <label class="control-label"><a href="@Model.Status.UpdateUri" target="_blank"><i class="fa fa-check"></i></a> @Html.ToolTip("Click the 'tick' to manually go to the page")</label>
                         <br />
                         <br />
-                        <label class="control-label">Launch Arguments</label>
+                        @*<label class="control-label">Launch Arguments</label>
                         @Html.ToolTip("This is if you run Ombi outside of a regular install e.g. you are launching with a custom port. This field will be used after we have updated to launch the application.")
                         <input id="args" class="form-control form-control-custom " placeholder="/etc/mono /opt/Ombi.exe">
                         <br />
-                        <button id="autoUpdate" class="btn btn-success-outline">Automatic Update (beta) <i class="fa fa-download"></i></button>
+                        <button id="autoUpdate" class="btn btn-success-outline">Automatic Update (beta) <i class="fa fa-download"></i></button>*@
                     }
                     else
                     {