diff --git a/src/NzbDrone.Api/Frontend/Mappers/BackupFileMapper.cs b/src/NzbDrone.Api/Frontend/Mappers/BackupFileMapper.cs
index 9e4912524..8e8393ef6 100644
--- a/src/NzbDrone.Api/Frontend/Mappers/BackupFileMapper.cs
+++ b/src/NzbDrone.Api/Frontend/Mappers/BackupFileMapper.cs
@@ -25,7 +25,7 @@ namespace NzbDrone.Api.Frontend.Mappers
 
         public override bool CanHandle(string resourceUrl)
         {
-            return resourceUrl.StartsWith("/backup/") && resourceUrl.ContainsIgnoreCase("nzbdrone_backup_")  && resourceUrl.EndsWith(".zip");
+            return resourceUrl.StartsWith("/backup/") && resourceUrl.ContainsIgnoreCase("radarr_backup_")  && resourceUrl.EndsWith(".zip");
         }
     }
 }
\ No newline at end of file
diff --git a/src/NzbDrone.Core/Backup/BackupService.cs b/src/NzbDrone.Core/Backup/BackupService.cs
index 8cc89d87b..39130703f 100644
--- a/src/NzbDrone.Core/Backup/BackupService.cs
+++ b/src/NzbDrone.Core/Backup/BackupService.cs
@@ -33,7 +33,7 @@ namespace NzbDrone.Core.Backup
 
         private string _backupTempFolder;
 
-        private static readonly Regex BackupFileRegex = new Regex(@"nzbdrone_backup_[._0-9]+\.zip", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private static readonly Regex BackupFileRegex = new Regex(@"radarr_backup_[._0-9]+\.zip", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         public BackupService(IMainDatabase maindDb,
                              IDiskTransferService diskTransferService,
@@ -49,7 +49,7 @@ namespace NzbDrone.Core.Backup
             _archiveService = archiveService;
             _logger = logger;
 
-            _backupTempFolder = Path.Combine(_appFolderInfo.TempFolder, "nzbdrone_backup");
+            _backupTempFolder = Path.Combine(_appFolderInfo.TempFolder, "radarr_backup");
         }
 
         public void Backup(BackupType backupType)
@@ -59,7 +59,7 @@ namespace NzbDrone.Core.Backup
             _diskProvider.EnsureFolder(_backupTempFolder);
             _diskProvider.EnsureFolder(GetBackupFolder(backupType));
 
-            var backupFilename = string.Format("nzbdrone_backup_{0:yyyy.MM.dd_HH.mm.ss}.zip", DateTime.Now);
+            var backupFilename = string.Format("radarr_backup_{0:yyyy.MM.dd_HH.mm.ss}.zip", DateTime.Now);
             var backupPath = Path.Combine(GetBackupFolder(backupType), backupFilename);
 
             Cleanup();
diff --git a/src/UI/AddMovies/SearchResultView.js b/src/UI/AddMovies/SearchResultView.js
index 3d50e1030..abeaf5016 100644
--- a/src/UI/AddMovies/SearchResultView.js
+++ b/src/UI/AddMovies/SearchResultView.js
@@ -58,7 +58,7 @@ var view = Marionette.ItemView.extend({
         var defaultProfile = Config.getValue(Config.Keys.DefaultProfileId);
         var defaultRoot = Config.getValue(Config.Keys.DefaultRootFolderId);
         var useSeasonFolder = Config.getValueBoolean(Config.Keys.UseSeasonFolder, true);
-        var defaultMonitorEpisodes = Config.getValue(Config.Keys.MonitorEpisodes, 'missing');
+        var defaultMonitorEpisodes = Config.getValue(Config.Keys.MonitorEpisodes, 'all');
 
         if (Profiles.get(defaultProfile)) {
             this.ui.profile.val(defaultProfile);
@@ -169,6 +169,7 @@ var view = Marionette.ItemView.extend({
 
         var profile = this.ui.profile.val();
         var rootFolderPath = this.ui.rootFolder.children(':selected').text();
+        var monitor = this.ui.monitor.val();
 
         var options = this._getAddMoviesOptions();
         options.searchForMovie = searchForMovie;
@@ -178,7 +179,7 @@ var view = Marionette.ItemView.extend({
             profileId      : profile,
             rootFolderPath : rootFolderPath,
             addOptions     : options,
-            monitored      : true
+            monitored      : (monitor === 'all' ? true : false)
         }, { silent : true });
 
         var self = this;
@@ -229,44 +230,10 @@ var view = Marionette.ItemView.extend({
     },
 
     _getAddMoviesOptions : function() {
-        var monitor = this.ui.monitor.val();
-
-        var options = {
+        return {
             ignoreEpisodesWithFiles    : false,
             ignoreEpisodesWithoutFiles : false
         };
-
-        if (monitor === 'all') {
-            return options;
-        }
-
-        else if (monitor === 'future') {
-            options.ignoreEpisodesWithFiles = true;
-            options.ignoreEpisodesWithoutFiles = true;
-        }
-
-        // else if (monitor === 'latest') {
-        //     this.model.setSeasonPass(lastSeason.seasonNumber);
-        // }
-
-        // else if (monitor === 'first') {
-        //     this.model.setSeasonPass(lastSeason.seasonNumber + 1);
-        //     this.model.setSeasonMonitored(firstSeason.seasonNumber);
-        // }
-
-        else if (monitor === 'missing') {
-            options.ignoreEpisodesWithFiles = true;
-        }
-
-        else if (monitor === 'existing') {
-            options.ignoreEpisodesWithoutFiles = true;
-        }
-
-        // else if (monitor === 'none') {
-        //     this.model.setSeasonPass(lastSeason.seasonNumber + 1);
-        // }
-
-        return options;
     }
 });
 
diff --git a/src/UI/AddMovies/SearchResultViewTemplate.hbs b/src/UI/AddMovies/SearchResultViewTemplate.hbs
index 35d213adb..069c140b3 100644
--- a/src/UI/AddMovies/SearchResultViewTemplate.hbs
+++ b/src/UI/AddMovies/SearchResultViewTemplate.hbs
@@ -41,9 +41,9 @@
                     <div class="form-group col-md-2">
                         <label>Monitor <i class="icon-sonarr-form-info monitor-tooltip x-monitor-tooltip"></i></label>
                         <select class="form-control col-md-2 x-monitor">
-                            <option value="all">All</option>
-                            <option value="missing">Missing</option>
-                            <option value="none">None</option>
+                            <option value="all">Yes</option>
+                            <!-- <option value="missing">Missing</option> -->
+                            <option value="none">No</option>
                         </select>
                     </div>