diff --git a/src/NzbDrone.Core/IndexerVersions/IndexerDefinitionUpdateService.cs b/src/NzbDrone.Core/IndexerVersions/IndexerDefinitionUpdateService.cs
index 44b9ffdc6..99c16bb19 100644
--- a/src/NzbDrone.Core/IndexerVersions/IndexerDefinitionUpdateService.cs
+++ b/src/NzbDrone.Core/IndexerVersions/IndexerDefinitionUpdateService.cs
@@ -110,6 +110,22 @@ namespace NzbDrone.Core.IndexerVersions
                     {
                         var definitionString = File.ReadAllText(file.FullName);
                         var definition = _deserializer.Deserialize<CardigannDefinition>(definitionString);
+
+                        //defaults
+                        if (definition.Settings == null)
+                        {
+                            definition.Settings = new List<SettingsField>
+                            {
+                                new SettingsField { Name = "username", Label = "Username", Type = "text" },
+                                new SettingsField { Name = "password", Label = "Password", Type = "password" }
+                            };
+                        }
+
+                        if (definition.Login != null && definition.Login.Method == null)
+                        {
+                            definition.Login.Method = "form";
+                        }
+
                         return definition;
                     }
                     catch (Exception e)
diff --git a/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannBase.cs b/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannBase.cs
index cd924c48e..2d51907df 100644
--- a/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannBase.cs
+++ b/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannBase.cs
@@ -216,15 +216,7 @@ namespace NzbDrone.Core.Indexers.Cardigann
 
             _logger.Debug("Populating config vars");
 
-            var defaultSettings = new List<SettingsField>
-            {
-                new SettingsField { Name = "username", Label = "Username", Type = "text" },
-                new SettingsField { Name = "password", Label = "Password", Type = "password" }
-            };
-
-            var settings = _definition.Settings ?? defaultSettings;
-
-            foreach (var setting in settings)
+            foreach (var setting in _definition.Settings)
             {
                 var name = ".Config." + setting.Name;
                 var value = _settings.ExtraFieldData.GetValueOrDefault(setting.Name, setting.Default);
diff --git a/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannRequestGenerator.cs b/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannRequestGenerator.cs
index 850285e37..b35953ab7 100644
--- a/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannRequestGenerator.cs
+++ b/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannRequestGenerator.cs
@@ -882,6 +882,7 @@ namespace NzbDrone.Core.Indexers.Cardigann
                 }
 
                 request.HttpRequest.Method = method;
+                request.HttpRequest.SuppressHttpError = true;
 
                 yield return request;
             }