diff --git a/NzbDrone.Api/NancyBootstrapper.cs b/NzbDrone.Api/NancyBootstrapper.cs
index cded8b292..2de87f802 100644
--- a/NzbDrone.Api/NancyBootstrapper.cs
+++ b/NzbDrone.Api/NancyBootstrapper.cs
@@ -5,6 +5,7 @@
 using Nancy.Bootstrapper;
 using Nancy.Conventions;
 using Nancy.Diagnostics;
+using NzbDrone.Api.Authentication;
 using NzbDrone.Api.ErrorManagement;
 using NzbDrone.Api.Extensions;
 using NzbDrone.Api.Frontend;
@@ -36,12 +37,9 @@ protected override void ApplicationStartup(TinyIoCContainer container, IPipeline
             AutomapperBootstraper.InitializeAutomapper();
 
             container.Resolve<DatabaseTarget>().Register();
-
+            container.Resolve<IEnableBasicAuthInNancy>().Register(pipelines);
             container.Resolve<IMessageAggregator>().PublishEvent(new ApplicationStartedEvent());
 
-            pipelines.EnableBasicAuthentication(new BasicAuthenticationConfiguration(
-                                                    container.Resolve<IUserValidator>(),
-                                                    "NzbDrone"));
 
             ApplicationPipelines.OnError.AddItemToEndOfPipeline(container.Resolve<NzbDroneErrorPipeline>().HandleException);
         }
diff --git a/NzbDrone.Api/NzbDrone.Api.csproj b/NzbDrone.Api/NzbDrone.Api.csproj
index 54785dcc3..9e1bfab6c 100644
--- a/NzbDrone.Api/NzbDrone.Api.csproj
+++ b/NzbDrone.Api/NzbDrone.Api.csproj
@@ -89,7 +89,8 @@
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Authentication\AuthenticationValidator.cs" />
+    <Compile Include="Authentication\AuthenticationService.cs" />
+    <Compile Include="Authentication\EnableBasicAuthInNancy.cs" />
     <Compile Include="Authentication\NzbDroneUser.cs" />
     <Compile Include="AutomapperBootstraper.cs" />
     <Compile Include="Calendar\CalendarModule.cs" />
diff --git a/NzbDrone.Api/NzbDroneApiModule.cs b/NzbDrone.Api/NzbDroneApiModule.cs
index 342c96d29..589d4ffee 100644
--- a/NzbDrone.Api/NzbDroneApiModule.cs
+++ b/NzbDrone.Api/NzbDroneApiModule.cs
@@ -8,7 +8,6 @@ public abstract class NzbDroneApiModule : NancyModule
         protected NzbDroneApiModule(string resource)
             : base("/api/" + resource.Trim('/'))
         {
-            this.RequiresAuthentication();
             Options["/"] = x => new Response();
         }
     }