diff --git a/sickbeard/__init__.py b/sickbeard/__init__.py
index 4c98ada476411207da59538291b276fabab69632..15a7c83a239bed1ce7637dd40847de08f1a5e2ae 100755
--- a/sickbeard/__init__.py
+++ b/sickbeard/__init__.py
@@ -30,7 +30,7 @@ from threading import Lock
 
 # apparently py2exe won't build these unless they're imported somewhere
 from sickbeard import providers, metadata
-from providers import ezrss, tvtorrents, btn, nzbmatrix, nzbsrus, newznab, womble, newzbin
+from providers import ezrss, tvtorrents, btn, nzbmatrix, nzbsrus, newznab, womble, newzbin, nzbs_org_old
 
 from sickbeard import searchCurrent, searchBacklog, showUpdater, versionChecker, properFinder, autoPostProcesser
 from sickbeard import helpers, db, exceptions, show_queue, search_queue, scheduler
diff --git a/sickbeard/providers/__init__.py b/sickbeard/providers/__init__.py
index fb8962d3d9710479ce943e4eef385d0cc9f9b5d3..71991a7932d32711a72404f06592c512345a216a 100755
--- a/sickbeard/providers/__init__.py
+++ b/sickbeard/providers/__init__.py
@@ -19,7 +19,7 @@
 __all__ = ['ezrss',
            'tvtorrents',
            'nzbmatrix',
-#           'nzbs_org',
+           'nzbs_org_old',
            'nzbsrus',
            'womble',
            'newzbin',
@@ -106,7 +106,7 @@ def getProviderModule(name):
     if name in __all__ and prefix+name in sys.modules:
         return sys.modules[prefix+name]
     else:
-        return None
+        raise Exception("Can't find "+prefix+name+" in "+repr(sys.modules))
 
 def getProviderClass(id):
 
diff --git a/sickbeard/providers/nzbs_org.py b/sickbeard/providers/nzbs_org_old.py
similarity index 95%
rename from sickbeard/providers/nzbs_org.py
rename to sickbeard/providers/nzbs_org_old.py
index fecea63c4db028fa50d9b92e327b240606ff2a44..d7f5eb10a9919287e2138de6f4dc59b34b2c83c3 100644
--- a/sickbeard/providers/nzbs_org.py
+++ b/sickbeard/providers/nzbs_org_old.py
@@ -38,7 +38,7 @@ class NZBsProvider(generic.NZBProvider):
 
 	def __init__(self):
 
-		generic.NZBProvider.__init__(self, "NZBs.org")
+		generic.NZBProvider.__init__(self, "NZBs.org Old")
 
 		self.supportsBacklog = True
 
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index adbe8ededc0393c55ecf97e918b7e3a465ff64ce..47e640f8aca7b5d27d050ed437bdc8067a74c0f5 100755
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -69,9 +69,9 @@ class PageTemplate (Template):
         self.sbHost = re.match("[^:]+", cherrypy.request.headers['Host'], re.X|re.M|re.S).group(0)
         self.projectHomePage = "http://code.google.com/p/sickbeard/"
 
-        if sickbeard.NZBS and sickbeard.NZBS_UID and sickbeard.NZBS_HASH and not getProviderClass('nzbs_org').key:
+        if sickbeard.NZBS and sickbeard.NZBS_UID and sickbeard.NZBS_HASH:
             logger.log(u"NZBs.org has been replaced, please check the config to configure the new provider!", logger.ERROR)
-            ui.notifications.error("NZBs.org Config Update", "NZBs.org must use the new API key from http://beta.nzbs.org. Please update your config.")
+            ui.notifications.error("NZBs.org Config Update", "NZBs.org has a new site. Please <a href=\""+sickbeard.WEB_ROOT+"/config/providers\">update your config</a> with the api key from <a href=\"http://beta.nzbs.org\">http://beta.nzbs.org</a> and then disable the old NZBs.org provider.")
 
         logPageTitle = 'Logs &amp; Errors'
         if len(classes.ErrorViewer.errors):
@@ -1130,6 +1130,8 @@ class ConfigProviders:
 
             if curProvider == 'nzbs_r_us':
                 sickbeard.NZBSRUS = curEnabled
+            elif curProvider == 'nzbs_org_old':
+                sickbeard.NZBS = curEnabled
             elif curProvider == 'nzbmatrix':
                 sickbeard.NZBMATRIX = curEnabled
             elif curProvider == 'newzbin':