diff --git a/components/editorControls/tinyMCE3/TinyMCE.cs b/components/editorControls/tinyMCE3/TinyMCE.cs
index f4ad03fac7..43cae0d770 100644
--- a/components/editorControls/tinyMCE3/TinyMCE.cs
+++ b/components/editorControls/tinyMCE3/TinyMCE.cs
@@ -185,7 +185,11 @@ namespace umbraco.editorControls.tinyMCE3
                     }
 
                     // language
-                    config.Add("language", User.GetCurrent().Language);
+                    string userLang = User.GetCurrent().Language.Contains("-")
+                                          ? User.GetCurrent().Language.Substring(0,
+                                                                                 User.GetCurrent().Language.IndexOf("-"))
+                                          : User.GetCurrent().Language; 
+                    config.Add("language", userLang);
 
                     config.Add("content_css", cssFiles);
                     config.Add("theme_umbraco_styles", styles);
diff --git a/components/editorControls/umbraco.editorControls.csproj b/components/editorControls/umbraco.editorControls.csproj
index cca7713b4a..af991252a2 100644
--- a/components/editorControls/umbraco.editorControls.csproj
+++ b/components/editorControls/umbraco.editorControls.csproj
@@ -78,7 +78,7 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\..\umbraco\presentation\bin\</OutputPath>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <BaseAddress>285212672</BaseAddress>
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>