diff --git a/src/Ombi.Api.Plex/IPlexApi.cs b/src/Ombi.Api.Plex/IPlexApi.cs
index 343eaa2d7..c79ec50c9 100644
--- a/src/Ombi.Api.Plex/IPlexApi.cs
+++ b/src/Ombi.Api.Plex/IPlexApi.cs
@@ -24,7 +24,7 @@ namespace Ombi.Api.Plex
         Task<PlexAccount> GetAccount(string authToken);
         Task<PlexMetadata> GetRecentlyAdded(string authToken, string uri, string sectionId);
         Task<OAuthPin> GetPin(int pinId);
-        Task<Uri> GetOAuthUrl(int pinId, string code, string applicationUrl);
+        Task<Uri> GetOAuthUrl(string code, string applicationUrl);
         Task<PlexAddWrapper> AddUser(string emailAddress, string serverId, string authToken, int[] libs);
     }
 }
\ No newline at end of file
diff --git a/src/Ombi.Api.Plex/PlexApi.cs b/src/Ombi.Api.Plex/PlexApi.cs
index f0808622f..fe6ba23e2 100644
--- a/src/Ombi.Api.Plex/PlexApi.cs
+++ b/src/Ombi.Api.Plex/PlexApi.cs
@@ -217,12 +217,11 @@ namespace Ombi.Api.Plex
             return await Api.Request<OAuthPin>(request);
         }
 
-        public async Task<Uri> GetOAuthUrl(int pinId, string code, string applicationUrl)
+        public async Task<Uri> GetOAuthUrl(string code, string applicationUrl)
         {
             var request = new Request("auth#", "https://app.plex.tv", HttpMethod.Get);
             await AddHeaders(request);
             
-            request.AddQueryString("pinID", pinId.ToString());
             request.AddQueryString("code", code);
             request.AddQueryString("context[device][product]", ApplicationName);
             request.AddQueryString("context[device][environment]", "bundled");
diff --git a/src/Ombi.Core/Authentication/PlexOAuthManager.cs b/src/Ombi.Core/Authentication/PlexOAuthManager.cs
index 426037bb7..76b1b5d97 100644
--- a/src/Ombi.Core/Authentication/PlexOAuthManager.cs
+++ b/src/Ombi.Core/Authentication/PlexOAuthManager.cs
@@ -36,17 +36,17 @@ namespace Ombi.Core.Authentication
             return await _api.GetAccount(accessToken);
         }
 
-        public async Task<Uri> GetOAuthUrl(int pinId, string code, string websiteAddress = null)
+        public async Task<Uri> GetOAuthUrl(string code, string websiteAddress = null)
         {
             var settings = await _customizationSettingsService.GetSettingsAsync();
-            var url = await _api.GetOAuthUrl(pinId, code, settings.ApplicationUrl.IsNullOrEmpty() ? websiteAddress : settings.ApplicationUrl);
+            var url = await _api.GetOAuthUrl(code, settings.ApplicationUrl.IsNullOrEmpty() ? websiteAddress : settings.ApplicationUrl);
 
             return url;
         }
 
-        public async Task<Uri> GetWizardOAuthUrl(int pinId, string code, string websiteAddress)
+        public async Task<Uri> GetWizardOAuthUrl(string code, string websiteAddress)
         {
-            var url = await _api.GetOAuthUrl(pinId, code, websiteAddress);
+            var url = await _api.GetOAuthUrl(code, websiteAddress);
             return url;
         }
     }
diff --git a/src/Ombi.Core/IPlexOAuthManager.cs b/src/Ombi.Core/IPlexOAuthManager.cs
index a5c0c44ff..7668ee882 100644
--- a/src/Ombi.Core/IPlexOAuthManager.cs
+++ b/src/Ombi.Core/IPlexOAuthManager.cs
@@ -7,8 +7,8 @@ namespace Ombi.Core.Authentication
     public interface IPlexOAuthManager
     {
         Task<string> GetAccessTokenFromPin(int pinId);
-        Task<Uri> GetOAuthUrl(int pinId, string code, string websiteAddress = null);
-        Task<Uri> GetWizardOAuthUrl(int pinId, string code, string websiteAddress);
+        Task<Uri> GetOAuthUrl(string code, string websiteAddress = null);
+        Task<Uri> GetWizardOAuthUrl(string code, string websiteAddress);
         Task<PlexAccount> GetAccount(string accessToken);
     }
 }
\ No newline at end of file
diff --git a/src/Ombi/Controllers/External/PlexController.cs b/src/Ombi/Controllers/External/PlexController.cs
index d7cefd091..f0492b580 100644
--- a/src/Ombi/Controllers/External/PlexController.cs
+++ b/src/Ombi/Controllers/External/PlexController.cs
@@ -283,12 +283,12 @@ namespace Ombi.Controllers.External
             Uri url;
             if (!wizard.Wizard)
             {
-                url = await _plexOAuthManager.GetOAuthUrl(wizard.Pin.id, wizard.Pin.code);
+                url = await _plexOAuthManager.GetOAuthUrl(wizard.Pin.code);
             }
             else
             {
                 var websiteAddress =$"{this.Request.Scheme}://{this.Request.Host}{this.Request.PathBase}";
-                url = await _plexOAuthManager.GetWizardOAuthUrl(wizard.Pin.id, wizard.Pin.code, websiteAddress);
+                url = await _plexOAuthManager.GetWizardOAuthUrl(wizard.Pin.code, websiteAddress);
             }
 
             if (url == null)
diff --git a/src/Ombi/Controllers/TokenController.cs b/src/Ombi/Controllers/TokenController.cs
index 1314a741a..87136fd00 100644
--- a/src/Ombi/Controllers/TokenController.cs
+++ b/src/Ombi/Controllers/TokenController.cs
@@ -83,7 +83,7 @@ namespace Ombi.Controllers
                 
                 var websiteAddress = $"{this.Request.Scheme}://{this.Request.Host}{this.Request.PathBase}";
                 //https://app.plex.tv/auth#?forwardUrl=http://google.com/&clientID=Ombi-Test&context%5Bdevice%5D%5Bproduct%5D=Ombi%20SSO&pinID=798798&code=4lgfd
-                var url = await _plexOAuthManager.GetOAuthUrl(model.PlexTvPin.id, model.PlexTvPin.code, websiteAddress);
+                var url = await _plexOAuthManager.GetOAuthUrl(model.PlexTvPin.code, websiteAddress);
                 if (url == null)
                 {
                     return new JsonResult(new