diff --git a/src/NzbDrone.Core.Test/IndexerTests/RarbgTests/RarbgFixture.cs b/src/NzbDrone.Core.Test/IndexerTests/RarbgTests/RarbgFixture.cs
index e8da2e1b3..39a9c84a7 100644
--- a/src/NzbDrone.Core.Test/IndexerTests/RarbgTests/RarbgFixture.cs
+++ b/src/NzbDrone.Core.Test/IndexerTests/RarbgTests/RarbgFixture.cs
@@ -30,7 +30,7 @@ namespace NzbDrone.Core.Test.IndexerTests.RarbgTests
             };
 
             Mocker.GetMock<IRarbgTokenProvider>()
-                .Setup(v => v.GetToken(It.IsAny<RarbgSettings>(), It.IsAny<string>()))
+                .Setup(v => v.GetToken(It.IsAny<RarbgSettings>()))
                 .Returns("validtoken");
         }
 
diff --git a/src/NzbDrone.Core/Indexers/Definitions/Rarbg/RarbgRequestGenerator.cs b/src/NzbDrone.Core/Indexers/Definitions/Rarbg/RarbgRequestGenerator.cs
index d4d9548c6..100e91f8a 100644
--- a/src/NzbDrone.Core/Indexers/Definitions/Rarbg/RarbgRequestGenerator.cs
+++ b/src/NzbDrone.Core/Indexers/Definitions/Rarbg/RarbgRequestGenerator.cs
@@ -36,7 +36,7 @@ namespace NzbDrone.Core.Indexers.Rarbg
             {
                 requestBuilder.AddQueryParam("search_themoviedb", tmdbId);
             }
-            else if (tvdbId.HasValue && tmdbId > 0)
+            else if (tvdbId.HasValue && tvdbId > 0)
             {
                 requestBuilder.AddQueryParam("search_tvdb", tvdbId);
             }
@@ -60,7 +60,7 @@ namespace NzbDrone.Core.Indexers.Rarbg
             }
 
             requestBuilder.AddQueryParam("limit", "100");
-            requestBuilder.AddQueryParam("token", _tokenProvider.GetToken(Settings, Settings.BaseUrl));
+            requestBuilder.AddQueryParam("token", _tokenProvider.GetToken(Settings));
             requestBuilder.AddQueryParam("format", "json_extended");
             requestBuilder.AddQueryParam("app_id", BuildInfo.AppName);