diff --git a/couchpotato/core/downloaders/base.py b/couchpotato/core/downloaders/base.py
index e90f951a..e1e851f3 100644
--- a/couchpotato/core/downloaders/base.py
+++ b/couchpotato/core/downloaders/base.py
@@ -18,9 +18,12 @@ class Downloader(Plugin):
     def download(self, data = {}):
         pass
 
-    def createFileName(self, data, filename, movie):
-        name = os.path.join('%s%s' % (toSafeString(data.get('name')), self.cpTag(movie)))
-        if data.get('type') == 'nzb' and "DOCTYPE nzb" not in filename:
+    def createNzbName(self, data, movie):
+        return '%s%s' % (toSafeString(data.get('name')), self.cpTag(movie))
+
+    def createFileName(self, data, filedata, movie):
+        name = os.path.join(self.createNzbName(data, movie))
+        if data.get('type') == 'nzb' and "DOCTYPE nzb" not in filedata:
             return '%s.%s' % (name, 'rar')
         return '%s.%s' % (name, data.get('type'))
 
diff --git a/couchpotato/core/downloaders/nzbget/main.py b/couchpotato/core/downloaders/nzbget/main.py
index 083f312d..b65e2511 100644
--- a/couchpotato/core/downloaders/nzbget/main.py
+++ b/couchpotato/core/downloaders/nzbget/main.py
@@ -22,7 +22,7 @@ class NZBGet(Downloader):
         log.info('Sending "%s" to NZBGet.' % data.get('name'))
 
         url = self.url % {'host': self.conf('host'), 'password': self.conf('password')}
-        nzb_name = data.get('name') + '.nzb'
+        nzb_name = '%s.nzb' % self.createNzbName(data, movie)
 
         rpc = xmlrpclib.ServerProxy(url)
         try:
diff --git a/couchpotato/core/downloaders/sabnzbd/main.py b/couchpotato/core/downloaders/sabnzbd/main.py
index d2b47786..41ac9206 100644
--- a/couchpotato/core/downloaders/sabnzbd/main.py
+++ b/couchpotato/core/downloaders/sabnzbd/main.py
@@ -39,7 +39,7 @@ class Sabnzbd(Downloader):
             'apikey': self.conf('api_key'),
             'cat': self.conf('category'),
             'mode': 'addurl',
-            'nzbname': '%s%s' % (data.get('name'), self.cpTag(movie)),
+            'nzbname': self.createNzbName(data, movie),
         }
 
         if isfunction(data.get('download')):