diff --git a/NzbDrone.Core/Controllers/DbConfigController.cs b/NzbDrone.Core/Controllers/DbConfigController.cs
index 7c91277f3..a8aa64f15 100644
--- a/NzbDrone.Core/Controllers/DbConfigController.cs
+++ b/NzbDrone.Core/Controllers/DbConfigController.cs
@@ -68,6 +68,9 @@ namespace NzbDrone.Core.Controllers
 
         private void SetValue(string key, string value)
         {
+            if (String.IsNullOrEmpty(key)) throw new ArgumentOutOfRangeException("key");
+            if (value== null) throw new ArgumentNullException("key");
+
             _logger.DebugFormat("Writing Setting to file. Key:'{0}' Value:'{1}'", key, value);
 
             _sonicRepo.Add(new Config { Key = key, Value = value });
diff --git a/NzbDrone.Web/Bin/NzbDrone.Web.dll b/NzbDrone.Web/Bin/NzbDrone.Web.dll
index 7884a5d0b..3cacc63d1 100644
Binary files a/NzbDrone.Web/Bin/NzbDrone.Web.dll and b/NzbDrone.Web/Bin/NzbDrone.Web.dll differ
diff --git a/NzbDrone.Web/Bin/NzbDrone.Web.pdb b/NzbDrone.Web/Bin/NzbDrone.Web.pdb
index 1652a1255..ef02c84de 100644
Binary files a/NzbDrone.Web/Bin/NzbDrone.Web.pdb and b/NzbDrone.Web/Bin/NzbDrone.Web.pdb differ
diff --git a/NzbDrone.Web/Controllers/SettingsController.cs b/NzbDrone.Web/Controllers/SettingsController.cs
index 8db1a5033..8f4d2507b 100644
--- a/NzbDrone.Web/Controllers/SettingsController.cs
+++ b/NzbDrone.Web/Controllers/SettingsController.cs
@@ -25,7 +25,7 @@ namespace NzbDrone.Web.Controllers
         }
 
         [HttpPost]
-        public ActionResult Save(SettingsModel model)
+        public ActionResult Index(SettingsModel model)
         {
             if (ModelState.IsValid)
             {
diff --git a/NzbDrone.Web/Views/Settings/Index.aspx b/NzbDrone.Web/Views/Settings/Index.aspx
index 671b08517..0e72de385 100644
--- a/NzbDrone.Web/Views/Settings/Index.aspx
+++ b/NzbDrone.Web/Views/Settings/Index.aspx
@@ -1,6 +1,6 @@
 <%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<NzbDrone.Web.Models.SettingsModel>" %>
-<%@ Import Namespace="NzbDrone.Web.Controllers" %>
 
+<%@ Import Namespace="NzbDrone.Web.Controllers" %>
 <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
     Index
 </asp:Content>
@@ -9,6 +9,7 @@
         Settings</h2>
     <% using (Html.BeginForm())
        { %>
+    <%: Html.ValidationSummary(true, "Account creation was unsuccessful. Please correct the errors and try again.") %>
     <div>
         <fieldset>
             <legend>General</legend>