diff --git a/src/Umbraco.Web.UI.Client/lib/umbraco/compat.js b/src/Umbraco.Web.UI.Client/lib/umbraco/compat.js
index fca51cb49a..2a166c8a1a 100644
--- a/src/Umbraco.Web.UI.Client/lib/umbraco/compat.js
+++ b/src/Umbraco.Web.UI.Client/lib/umbraco/compat.js
@@ -30,7 +30,15 @@
         });
 
         $.ctrl("S", function(){
-            $(".umb-panel-header .btn-primary").click();
+            var link = $(".umb-panel-header .btn-primary");
+            var b = link.click();
+
+            //this is made of bad, to work around webforms horrible wiring
+            if(!link.hasClass("client-side") && link.attr("href").indexOf("javascript:") == 0){
+                eval(link.attr('href').replace('javascript:',''));
+            }else{
+                link.click();
+            }
         });
 
     });     
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index 8adf63406e..32bafd4b82 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -68,15 +68,7 @@
     <key alias="atViewingFor">Viewing for</key>
   </area>
 
-  <area alias="placeholders">
-    <key alias="username">Enter your username</key>
-    <key alias="password">Enter your password</key>
-
-    <key alias="name">Enter a name...</key>
-    <key alias="search">Type to search...</key>
-    <key alias="filter">Type to filter...</key>
-  </area>
-
+  
   <area alias="buttons">
     <key alias="select">Select</key>
     <key alias="somethingElse">Do something else</key>
@@ -245,6 +237,15 @@
    ]]></key>
     <key alias="displayName">Culture Name</key>
   </area>
+  <area alias="placeholders">
+    <key alias="username">Enter your username</key>
+    <key alias="password">Enter your password</key>
+
+    <key alias="name">Enter a name...</key>
+    <key alias="search">Type to search...</key>
+    <key alias="filter">Type to filter...</key>
+  </area>
+
   <area alias="editcontenttype">
     <key alias="allowedchildnodetypes">Allowed child nodetypes</key>
     <key alias="create">Create</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
index 37d514652b..b4266e8fd2 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
@@ -54,13 +54,6 @@
     <key alias="atViewingFor">Viewing for</key>
   </area>
 
-  <area alias="placeholders">
-    <key alias="username">Enter your username</key>
-    <key alias="password">Enter your password</key>
-    <key alias="search">Type to search</key>
-    <key alias="filter">Type to filter</key>
-  </area>
-
   <area alias="buttons">
     <key alias="bold">Bold</key>
     <key alias="deindent">Cancel Paragraph Indent</key>
@@ -972,6 +965,12 @@ To manage your website, simply open the umbraco back office and start adding con
     <key alias="updateNoServer">No connection to server</key>
     <key alias="updateNoServerError">Error checking for update. Please review trace-stack for further information</key>
   </area>
+  <area alias="placeholders">
+    <key alias="username">Enter your username</key>
+    <key alias="password">Enter your password</key>
+    <key alias="search">Type to search</key>
+    <key alias="filter">Type to filter</key>
+  </area>
   <area alias="user">
     <key alias="administrators">Administrator</key>
     <key alias="categoryField">Category field</key>
diff --git a/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs b/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs
index f582f193e0..a6275297fe 100644
--- a/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs
+++ b/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs
@@ -162,7 +162,7 @@ namespace Umbraco.Web.UI.Umbraco.Settings.Views
             SaveButton.Text = ui.Text("save");
             SaveButton.ButtonType = MenuButtonType.Primary;
             SaveButton.ID = "save";
-
+            SaveButton.CssClass = "client-side";
 
 			Panel1.Text = ui.Text("edittemplate");
 			pp_name.Text = ui.Text("name", base.getUser());
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/editXslt.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/editXslt.aspx.cs
index 5b1ec90e04..0984d038af 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/editXslt.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/editXslt.aspx.cs
@@ -54,6 +54,7 @@ namespace umbraco.cms.presentation.developer
             SaveButton.Text = ui.Text("save");
             SaveButton.ButtonType = MenuButtonType.Primary;
             SaveButton.ID = "save";
+            SaveButton.CssClass = "client-side";
 
             var code = UmbracoPanel1.NewTabPage("xslt");
             code.Controls.Add(pane1);
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs
index 4f2b8b017e..fe193d3b91 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs
@@ -102,7 +102,8 @@ namespace umbraco.cms.presentation.settings
             SaveButton.Text = ui.Text("save");
             SaveButton.ButtonType = MenuButtonType.Primary;
             SaveButton.ID = "save";
-           
+            SaveButton.CssClass = "client-side";
+
 			Panel1.Text = ui.Text("edittemplate");
 			pp_name.Text = ui.Text("name", UmbracoUser);
             pp_alias.Text = ui.Text("alias", UmbracoUser);
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/scripts/editScript.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/scripts/editScript.aspx.cs
index 8340d97dac..7c110e7f79 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/scripts/editScript.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/scripts/editScript.aspx.cs
@@ -121,6 +121,7 @@ namespace umbraco.cms.presentation.settings.scripts
             SaveButton.Text = ui.Text("save");
             SaveButton.ButtonType = MenuButtonType.Primary;
             SaveButton.ID = "save";
+            SaveButton.CssClass = "client-side";
 
             if (editorSource.CodeBase == uicontrols.CodeArea.EditorType.HTML)
             {
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/editstylesheet.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/editstylesheet.aspx.cs
index cb97f9c939..770a5b52cd 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/editstylesheet.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/editstylesheet.aspx.cs
@@ -40,6 +40,7 @@ namespace umbraco.cms.presentation.settings.stylesheet
             SaveButton.Text = ui.Text("save");
             SaveButton.ButtonType = MenuButtonType.Primary;
             SaveButton.ID = "save";
+            SaveButton.CssClass = "client-side";
         }
 
         protected void Page_Load(object sender, EventArgs e)
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx.cs
index 6043a4aa9d..9e9e4b7802 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx.cs
@@ -57,6 +57,7 @@ namespace umbraco.cms.presentation.settings.stylesheet
             bt.Click += SaveClick;
             bt.Text = ui.Text("save");
             bt.ToolTip = ui.Text("save");
+            bt.ButtonType = uicontrols.MenuButtonType.Primary;
             bt.ID = "save";
             SetupPreView();
         }
diff --git a/src/umbraco.controls/MenuButton.cs b/src/umbraco.controls/MenuButton.cs
index 6b85812231..0f24f65f22 100644
--- a/src/umbraco.controls/MenuButton.cs
+++ b/src/umbraco.controls/MenuButton.cs
@@ -49,8 +49,8 @@ namespace umbraco.uicontrols
                 }
             }
 
-            cssClass += " btn-" + Enum.GetName(ButtonType.GetType(), ButtonType).ToLower();
-            this.CssClass = cssClass;
+            cssClass += " btn-" + Enum.GetName(ButtonType.GetType(), ButtonType).ToLower() + " " + CssClass;
+            this.CssClass = cssClass.Trim();
 
 
             base.Render(writer);