diff --git a/src/Umbraco.Core/StringExtensions.cs b/src/Umbraco.Core/StringExtensions.cs
index a463e36bff..13cb906786 100644
--- a/src/Umbraco.Core/StringExtensions.cs
+++ b/src/Umbraco.Core/StringExtensions.cs
@@ -907,7 +907,7 @@ namespace Umbraco.Core
         /// This allows you to replace strings like & , etc.. with your replacement character before the automatic
         /// reduction.
         /// </remarks>
-        [UmbracoWillObsolete("This method should be removed. Use ToUrlSegment instead.")]
+        [Obsolete("This method should be removed. Use ToUrlSegment instead.")]
         public static string ToUrlAlias(this string value, IDictionary<string, string> charReplacements, bool replaceDoubleDashes, bool stripNonAscii, bool urlEncode)
         {
             var helper = ShortStringHelper;
@@ -931,7 +931,7 @@ namespace Umbraco.Core
         ///  and <c>UmbracoSettings.RemoveDoubleDashesFromUrlReplacing</c>.</para>
         /// <para>Other helpers may use different parameters.</para>
         /// </remarks>
-        [UmbracoWillObsolete("This method should be removed. Use ToUrlSegment instead.")]
+        [Obsolete("This method should be removed. Use ToUrlSegment instead.")]
         public static string FormatUrl(this string url)
         {
             var helper = ShortStringHelper;
@@ -1011,7 +1011,7 @@ namespace Umbraco.Core
         /// <param name="removeSpaces">Indicates whether spaces should be removed. THIS PARAMETER IS IGNORED.</param>
         /// <returns>The safe alias.</returns>
         /// <remarks>CamelCase, and remove spaces, whatever the parameters.</remarks>
-        [UmbracoWillObsolete("This method should be removed. Use ToSafeAlias instead.")]
+        [Obsolete("This method should be removed. Use ToSafeAlias instead.")]
         public static string ToUmbracoAlias(this string phrase, StringAliasCaseType caseType = StringAliasCaseType.CamelCase, bool removeSpaces = false)
         {
             var helper = ShortStringHelper;
@@ -1056,7 +1056,7 @@ namespace Umbraco.Core
         /// <para>This is the legacy method, so we can't really change it, although it has issues (see unit tests).</para>
         /// <para>It does more than "converting the case", and also remove spaces, etc.</para>
         /// </remarks>
-        [UmbracoWillObsolete("This method should be removed. Use CleanString instead.")]
+        [Obsolete("This method should be removed. Use CleanString instead.")]
         public static string ConvertCase(this string phrase, StringAliasCaseType cases)
         {
             var helper = ShortStringHelper;
diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs
index f34a2a70eb..3c36f1c282 100644
--- a/src/Umbraco.Tests/Services/ContentServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs
@@ -223,6 +223,27 @@ namespace Umbraco.Tests.Services
             Assert.That(content.WriterId, Is.EqualTo(user.Id));
         }
 
+        [Test]
+        public void Can_Save_New_Content_With_Explicit_User()
+        {
+            var user = new User(ServiceContext.UserService.GetUserTypeByAlias("admin"))
+                {
+                    Name = "Test",
+                    Email = "test@test.com",
+                    Username = "test",
+                    Password = "test"
+                };
+            ServiceContext.UserService.SaveUser(user);
+            var content = new Content("Test", -1, ServiceContext.ContentTypeService.GetContentType("umbTextpage"));
+
+            // Act
+            ServiceContext.ContentService.Save(content, (int)user.Id);
+
+            // Assert
+            Assert.That(content.CreatorId, Is.EqualTo(user.Id));
+            Assert.That(content.WriterId, Is.EqualTo(user.Id));
+        }
+
         [Test]
         public void Cannot_Create_Content_With_Non_Existing_ContentType_Alias()
         {
diff --git a/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltChooseExtension.aspx b/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltChooseExtension.aspx
index a127ead2d5..2540c5290a 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltChooseExtension.aspx
+++ b/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltChooseExtension.aspx
@@ -1,23 +1,22 @@
 <%@ Page Language="c#" Codebehind="xsltChooseExtension.aspx.cs" MasterPageFile="../../masterpages/umbracoDialog.Master"  AutoEventWireup="True"
   Inherits="umbraco.developer.xsltChooseExtension" %>
-  <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Import Namespace="Umbraco.Web" %>  <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
   
 <asp:Content ContentPlaceHolderID="head" runat="server">
     <script type="text/javascript">
-      function returnResult() {
-        result = document.getElementById('<%= assemblies.ClientID %>').value + ":" + document.getElementById('selectedMethod').value + "(";
-        for (var i = 0; i < document.forms[0].length - 1; i++) {
-          if (document.forms[0][i].name.indexOf('param') > -1)
-            result = result + "'" + document.forms[0][i].value + "', "
+        function returnResult() {
+            var result = document.getElementById('<%= assemblies.ClientID %>').value + ":" + document.getElementById('selectedMethod').value + "(";
+            for (var i = 0; i < document.forms[0].length - 1; i++) {
+                if (document.forms[0][i].name.indexOf('param') > -1)
+                    result = result + "'" + document.forms[0][i].value + "', ";
+            }
+            if (result.substring(result.length - 1, result.length) == " ")
+                result = result.substring(0, result.length - 2);
+            result = result + ")";
+            
+            document.location = 'xsltInsertValueOf.aspx?objectId=<%=Request.GetCleanedItem("objectId")%>&value=' + result;
         }
-        if (result.substring(result.length - 1, result.length) == " ")
-          result = result.substring(0, result.length - 2);
-        result = result + ")"
-
-
-        document.location = 'xsltInsertValueOf.aspx?objectId=<%=umbraco.helper.Request("objectId")%>&value=' + result;
-      }
-</script>
+    </script>
 
 <style type="text/css">
 div.code{padding: 7px 0px 7px 0px;  font-family: Consolas,courier;}
diff --git a/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltInsertValueOf.aspx b/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltInsertValueOf.aspx
index f5188b41ac..4a206a04b2 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltInsertValueOf.aspx
+++ b/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltInsertValueOf.aspx
@@ -1,4 +1,5 @@
 <%@ Page Language="c#" MasterPageFile="../../masterpages/umbracoDialog.Master" Codebehind="xsltInsertValueOf.aspx.cs" AutoEventWireup="True"  Inherits="umbraco.developer.xsltInsertValueOf" %>
+<%@ Import Namespace="Umbraco.Web" %>
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
 
@@ -13,13 +14,13 @@
     result = '<xsl:value-of select="' + document.getElementById('<%= valueOf.ClientID %>').value + '"' + checked + '/>';
 
     UmbClientMgr.contentFrame().focus();
-    UmbClientMgr.contentFrame().UmbEditor.Insert(result, '', '<%=umbraco.helper.Request("objectId")%>');
+    UmbClientMgr.contentFrame().UmbEditor.Insert(result, '', '<%=Request.GetCleanedItem("objectId")%>');
 
     UmbClientMgr.closeModalWindow();
   }
 
   function getExtensionMethod() {
-    document.location = 'xsltChooseExtension.aspx?objectId=<%=umbraco.helper.Request("objectId")%>';
+    document.location = 'xsltChooseExtension.aspx?objectId=<%=Request.GetCleanedItem("objectId")%>';
   }
 
   function recieveExtensionMethod(theValue) {
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/AssignDomain.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/AssignDomain.aspx
index a2ecac4be2..8bee1cd9b4 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/AssignDomain.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/AssignDomain.aspx
@@ -1,9 +1,9 @@
-<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master" Codebehind="AssignDomain.aspx.cs" AutoEventWireup="True" Inherits="umbraco.dialogs.AssignDomain" %>
+<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="True" Inherits="umbraco.dialogs.AssignDomain" %>
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 
 <asp:Content ContentPlaceHolderID="head" runat="server">
 <script type="text/javascript">
-	function doSubmit() {document.Form1["ok"].click()}
+    function doSubmit() { document.Form1["ok"].click(); }
 	var functionsFrame = this;
 	var tabFrame = this;
 	var isDialog = true;
@@ -14,7 +14,6 @@
 </asp:Content>
 
 <asp:Content ContentPlaceHolderID="body" runat="server">
-    <input type="hidden" name="domainId" value="<%=umbraco.helper.Request("editDomain")%>" />
     
     <cc1:Feedback ID="FeedBackMessage" runat="server" />
     
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/create.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/create.aspx
index 92e1b86ed3..17b231f923 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/create.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/create.aspx
@@ -1,6 +1,7 @@
-<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master" CodeBehind="create.aspx.cs"
+<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master" 
     AutoEventWireup="True" Inherits="umbraco.dialogs.create" %>
 
+<%@ Import Namespace="Umbraco.Web" %>
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register Src="../controls/Tree/TreeControl.ascx" TagName="TreeControl" TagPrefix="umbraco" %>
 <asp:Content ContentPlaceHolderID="head" runat="server">
@@ -20,10 +21,10 @@
 			document.getElementById("ok").disabled = false;
 			// Get node name by xmlrequest
 			if (id > 0) {
-			    umbraco.presentation.webservices.CMSNode.GetNodeName('<%=umbraco.BasePages.BasePage.umbracoUserContextID%>', id, updateName);
+			    umbraco.presentation.webservices.CMSNode.GetNodeName('<%=umbracoUserContextID%>', id, updateName);
 				}
 			else			
-				pageName.html("<p><strong><%=umbraco.ui.Text(umbraco.helper.Request("app"))%></strong> <%= umbraco.ui.Text("moveOrCopy","nodeSelected") %></p>");
+				pageName.html("<p><strong><%=umbraco.ui.Text(App)%></strong> <%= umbraco.ui.Text("moveOrCopy","nodeSelected") %></p>");
 				pageNameHolder.attr("class","success");
 		}
 		
@@ -33,17 +34,17 @@
 		}
 		
 		function onNodeSelectionConfirmed() {
-		    document.location.href = 'create.aspx?nodeType=<%=umbraco.helper.Request("nodeType")%>&app=<%=umbraco.helper.Request("app")%>&nodeId=' + document.getElementById('nodeId').value
+		    document.location.href = 'create.aspx?nodeType=<%=Request.GetCleanedItem("nodeType")%>&app=<%=App%>&nodeId=' + document.getElementById('nodeId').value
 		}
 	
     </script>
 
 </asp:Content>
 <asp:Content ContentPlaceHolderID="body" runat="server">
-    <input type="hidden" id="nodeId" name="nodeId" value="<%=umbraco.helper.Request("nodeId")%>" />
+    <input type="hidden" id="nodeId" name="nodeId" value="<%=Request.GetCleanedItem("nodeId")%>" />
     <input type="hidden" id="path" name="path" value="" runat="server" />
     <cc1:Pane ID="pane_chooseNode" runat="server" Style="overflow: auto; height: 250px;">
-        <umbraco:TreeControl runat="server" ID="JTree" App='<%#umbraco.helper.Request("app") %>'
+        <umbraco:TreeControl runat="server" ID="JTree" App='<%#App %>'
             IsDialog="true" DialogMode="id" ShowContextMenu="false" FunctionToCall="dialogHandler"
             Height="230"></umbraco:TreeControl>
     </cc1:Pane>
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/emptyTrashcan.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/emptyTrashcan.aspx
index 8570f00910..a6bcd4084b 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/emptyTrashcan.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/emptyTrashcan.aspx
@@ -1,11 +1,12 @@
-<%@ Page Language="C#" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="true" CodeBehind="emptyTrashcan.aspx.cs" Inherits="umbraco.presentation.dialogs.emptyTrashcan" %>
+<%@ Page Language="C#" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="true" Inherits="umbraco.presentation.dialogs.emptyTrashcan" %>
+<%@ Import Namespace="System.Globalization" %>
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 
 <asp:Content ContentPlaceHolderID="head" runat="server">
 		<script type="text/javascript">
 		
-		    var recycleBinType = '<%=umbraco.helper.Request("type")%>';
-		    var emptyTotal = '<%= umbraco.cms.businesslogic.RecycleBin.Count((umbraco.cms.businesslogic.RecycleBin.RecycleBinType) Enum.Parse(typeof(umbraco.cms.businesslogic.RecycleBin.RecycleBinType), umbraco.helper.Request("type"), true)).ToString()%>';
+		    var recycleBinType = '<%=BinType.ToString()%>';
+		    var emptyTotal = '<%= umbraco.cms.businesslogic.RecycleBin.Count(BinType).ToString(CultureInfo.InvariantCulture)%>';
 		    
 		    function emptyRecycleBin() {
     			jQuery('#formDiv').hide();
@@ -60,19 +61,19 @@
 		
 		<cc1:ProgressBar ID="progbar" runat="server" Title="Please wait..." />
 		<br />
-		<span class="guiDialogTiny" id="statusLabel"><%=umbraco.ui.Text("deleting", this.getUser())%></span>
+		<span class="guiDialogTiny" id="statusLabel"><%=umbraco.ui.Text("deleting", UmbracoUser)%></span>
 		</div>
 	  	  	  
 	  <div id="formDiv">
 	    <p><%= umbraco.ui.Text("defaultdialogs", "recycleBinWarning")%></p>
-		   <input type="checkbox" id="confirmDelete" onclick="$get('ok').disabled = !this.checked;" /> <label for="confirmDelete"><%=umbraco.ui.Text("defaultdialogs", "confirmEmptyTrashcan", umbraco.cms.businesslogic.RecycleBin.Count((umbraco.cms.businesslogic.RecycleBin.RecycleBinType)Enum.Parse(typeof(umbraco.cms.businesslogic.RecycleBin.RecycleBinType), umbraco.helper.Request("type"), true)).ToString(), this.getUser())%></label>
+		   <input type="checkbox" id="confirmDelete" onclick="$get('ok').disabled = !this.checked;" /> <label for="confirmDelete"><%=umbraco.ui.Text("defaultdialogs", "confirmEmptyTrashcan", umbraco.cms.businesslogic.RecycleBin.Count(BinType).ToString(CultureInfo.InvariantCulture), UmbracoUser)%></label>
 		</div>
 	  </cc1:PropertyPanel>
 	  </cc1:Pane>
 	  
 		<br />
 		<div id="buttons">
-		<input type="button" ID="ok" value="<%=umbraco.ui.Text("actions", "emptyTrashcan", this.getUser()) %>" class="guiInputButton" onclick="if ($get('confirmDelete').checked) {emptyRecycleBin();}" disabled="true" />  
+		<input type="button" ID="ok" value="<%=umbraco.ui.Text("actions", "emptyTrashcan", UmbracoUser) %>" class="guiInputButton" onclick="if ($get('confirmDelete').checked) {emptyRecycleBin();}" disabled="true" />  
 		<em><%= umbraco.ui.Text("or") %></em> 
     <a href="#" onclick="UmbClientMgr.closeModalWindow();">
       <%=umbraco.ui.Text("cancel")%>
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/insertMacro.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/insertMacro.aspx
index e34536f1b0..eeacb6a936 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/insertMacro.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/insertMacro.aspx
@@ -1,5 +1,6 @@
 <%@ Page Language="c#" MasterPageFile="../masterpages/umbracoPage.Master" ValidateRequest="false" Codebehind="insertMacro.aspx.cs" AutoEventWireup="True"
   Inherits="umbraco.dialogs.insertMacro" Trace="false" %>
+<%@ Import Namespace="Umbraco.Web" %>
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 
 <asp:Content ContentPlaceHolderID="head" runat="server">
@@ -72,8 +73,8 @@
     
     <%if (Request["macroID"] != null || Request["macroAlias"] != null) {%>
     
-    <input type="hidden" name="macroID" value="<%=umbraco.helper.Request("macroID")%>" />
-    <input type="hidden" name="macroAlias" value="<%=umbraco.helper.Request("macroAlias")%>" />
+    <input type="hidden" name="macroID" value="<%=Request.GetCleanedItem("macroID")%>" />
+    <input type="hidden" name="macroAlias" value="<%=Request.GetCleanedItem("macroAlias")%>" />
     
     <div class="macroProperties">
       <cc1:Pane id="pane_edit" runat="server">
@@ -81,9 +82,9 @@
       </cc1:Pane>
     </div>
     <p>
-    <input type="button" value="<%=umbraco.ui.Text("general", "ok", this.getUser())%>" onclick="updateMacro()" />
+    <input type="button" value="<%=umbraco.ui.Text("general", "ok", UmbracoUser)%>" onclick="updateMacro()" />
     &nbsp; <em> or </em> &nbsp;
-     <a href="#" style="color: blue"  onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("general", "cancel", this.getUser())%></a>
+     <a href="#" style="color: blue"  onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("general", "cancel", UmbracoUser)%></a>
     </p>
     <%} else {%>
     
@@ -93,9 +94,9 @@
       </cc1:PropertyPanel>
     </cc1:Pane>
     <p>
-    <input type="submit" value="<%=umbraco.ui.Text("general", "ok", this.getUser())%>" />
+    <input type="submit" value="<%=umbraco.ui.Text("general", "ok", UmbracoUser)%>" />
     &nbsp; <em> or </em> &nbsp;
-     <a href="#" style="color: blue"  onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("general", "cancel", this.getUser())%></a>
+     <a href="#" style="color: blue"  onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("general", "cancel", UmbracoUser)%></a>
     </p>
     
     <%}%>
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/moveOrCopy.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/moveOrCopy.aspx
index ea5cef2a8a..683b940f99 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/moveOrCopy.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/moveOrCopy.aspx
@@ -1,5 +1,6 @@
 <%@ Page Language="c#" CodeBehind="moveOrCopy.aspx.cs" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="True" Inherits="Umbraco.Web.UI.Umbraco.Dialogs.MoveOrCopy" %>
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
+<%@ Import Namespace="Umbraco.Web" %>
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register Src="../controls/Tree/TreeControl.ascx" TagName="TreeControl" TagPrefix="umbraco" %>
 
@@ -13,11 +14,11 @@
 				
 				// Get node name by xmlrequest
 				if (id > 0)
-						umbraco.presentation.webservices.CMSNode.GetNodeName('<%=umbraco.BasePages.BasePage.umbracoUserContextID%>', id, updateName);
+						umbraco.presentation.webservices.CMSNode.GetNodeName('<%=umbracoUserContextID%>', id, updateName);
 				else{
-					//document.getElementById("pageNameContent").innerHTML = "'<strong><%=umbraco.ui.Text(umbraco.helper.Request("app"))%></strong>' <%= umbraco.ui.Text("moveOrCopy","nodeSelected") %>";
+					//document.getElementById("pageNameContent").innerHTML = "'<strong><%=umbraco.ui.Text(Request.GetCleanedItem("app"))%></strong>' <%= umbraco.ui.Text("moveOrCopy","nodeSelected") %>";
 			    
-					jQuery("#pageNameContent").html("<strong><%=umbraco.ui.Text(umbraco.helper.Request("app"))%></strong> <%= umbraco.ui.Text("moveOrCopy","nodeSelected") %>");
+					jQuery("#pageNameContent").html("<strong><%=umbraco.ui.Text(Request.GetCleanedItem("app"))%></strong> <%= umbraco.ui.Text("moveOrCopy","nodeSelected") %>");
 					jQuery("#pageNameHolder").attr("class","success");
 			  }
 			}
@@ -58,7 +59,7 @@
 	<cc1:Feedback ID="feedback" runat="server" />
 	<cc1:Pane ID="pane_form" runat="server" Visible="false">
 		<cc1:PropertyPanel runat="server" Style="overflow: auto; height: 220px;position: relative;">
-			<umbraco:TreeControl runat="server" ID="JTree" App='<%#umbraco.helper.Request("app") %>'
+			<umbraco:TreeControl runat="server" ID="JTree" App='<%#Request.GetCleanedItem("app") %>'
                 IsDialog="true" DialogMode="id" ShowContextMenu="false" FunctionToCall="dialogHandler"
                 Height="200"></umbraco:TreeControl>
 		</cc1:PropertyPanel>
@@ -84,8 +85,8 @@
 		<p>
 			<asp:Button ID="ok" runat="server" CssClass="guiInputButton" OnClick="HandleMoveOrCopy"></asp:Button>
 			&nbsp; <em>
-				<%=umbraco.ui.Text("general", "or", this.getUser())%></em> &nbsp; <a href="#" style="color: blue" onclick="UmbClientMgr.closeModalWindow()">
-					<%=umbraco.ui.Text("general", "cancel", this.getUser())%></a>
+				<%=umbraco.ui.Text("general", "or", UmbracoUser)%></em> &nbsp; <a href="#" style="color: blue" onclick="UmbClientMgr.closeModalWindow()">
+					<%=umbraco.ui.Text("general", "cancel", UmbracoUser)%></a>
 		</p>
 	</asp:Panel>
 </asp:Content>
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx
index 6946e840b7..915d480366 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx
@@ -2,6 +2,7 @@
 
 <%@ Import Namespace="System.Globalization" %>
 <%@ Import Namespace="Umbraco.Core.IO" %>
+<%@ Import Namespace="Umbraco.Web" %>
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
 
@@ -71,8 +72,8 @@
                 submitButton: jQuery("#submitButton"),
                 closeWindowButton: jQuery("#closeWindowButton"),
                 dateTimeFormat: "<%=CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern%> <%=CultureInfo.CurrentCulture.DateTimeFormat.ShortTimePattern%>",
-                currentId: "<%=umbraco.helper.Request("ID")%>",
-                serviceUrl: "<%= IOHelper.ResolveUrl(SystemDirectories.Umbraco)%>/WebServices/NodeSorter.asmx/UpdateSortOrder?app=<%=umbraco.helper.Request("app")%>"
+                currentId: "<%=Request.GetCleanedItem("ID")%>",
+                serviceUrl: "<%= IOHelper.ResolveUrl(SystemDirectories.Umbraco)%>/WebServices/NodeSorter.asmx/UpdateSortOrder?app=<%=Request.GetCleanedItem("app")%>"
             });
 
             sortDialog.init();
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/umbracoField.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/umbracoField.aspx
index 51afa1f355..89999a5977 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/umbracoField.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/umbracoField.aspx
@@ -1,6 +1,7 @@
 <%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master" CodeBehind="umbracoField.aspx.cs"
     AutoEventWireup="True" Inherits="umbraco.dialogs.umbracoField" %>
 
+<%@ Import Namespace="Umbraco.Web" %>
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
 
@@ -13,7 +14,7 @@
                     submitButton: $("#submitButton"),
                     form: document.forms[0],
                     tagName: document.forms[0].<%= tagName.ClientID %>.value,
-                    objectId: '<%=umbraco.helper.Request("objectId")%>'
+                    objectId: '<%=Request.GetCleanedItem("objectId")%>'
                 });
                 umbracoField.init();
             });            
@@ -129,7 +130,7 @@
     <div class="umb-panel-footer">
         <div class="btn-toolbar umb-btn-toolbar">
             <a id="cancelButton" href="#" class="btn btn-link">
-                <%=umbraco.ui.Text("general", "cancel", this.getUser())%></a> 
+                <%=umbraco.ui.Text("general", "cancel", UmbracoUser)%></a> 
     
             <input id="submitButton" type="button" name="gem" class="btn btn-primary" value="<%=umbraco.ui.Text("insert")%>" />
         </div>
diff --git a/src/Umbraco.Web.UI/umbraco/plugins/tinymce3/insertMacro.aspx b/src/Umbraco.Web.UI/umbraco/plugins/tinymce3/insertMacro.aspx
index ca3e9f2bcd..0e935b4ed5 100644
--- a/src/Umbraco.Web.UI/umbraco/plugins/tinymce3/insertMacro.aspx
+++ b/src/Umbraco.Web.UI/umbraco/plugins/tinymce3/insertMacro.aspx
@@ -1,6 +1,7 @@
 <%@ Page Language="c#" ValidateRequest="false" CodeBehind="insertMacro.aspx.cs" AutoEventWireup="True"
     Inherits="umbraco.presentation.tinymce3.insertMacro" Trace="false" %>
 
+<%@ Import Namespace="Umbraco.Web" %>
 <%@ Register TagPrefix="ui" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
 <%@ Register TagPrefix="asp" Namespace="System.Web.UI" Assembly="System.Web" %>
@@ -105,8 +106,8 @@
     <input type="hidden" name="macroMode" value="<%=Request["mode"]%>" />
     <%if (Request["umb_macroID"] != null || Request["umb_macroAlias"] != null)
       {%>
-    <input type="hidden" name="umb_macroID" value="<%=umbraco.helper.Request("umb_macroID")%>" />
-    <input type="hidden" name="umb_macroAlias" value="<%=umbraco.helper.Request("umb_macroAlias")%>" />
+    <input type="hidden" name="umb_macroID" value="<%=Request.GetCleanedItem("umb_macroID")%>" />
+    <input type="hidden" name="umb_macroAlias" value="<%=Request.GetCleanedItem("umb_macroAlias")%>" />
     <% }%>
     <ui:Pane ID="pane_edit" runat="server" Visible="false">
         <div class="macroPane">
@@ -118,7 +119,7 @@
             <asp:Button ID="bt_renderMacro" OnClick="renderMacro_Click" runat="server" Text="ok">
             </asp:Button>
             <em>or </em><a id="cancelbtn" href="#" style="color: blue" onclick="tinyMCEPopup.close();">
-                <%=umbraco.ui.Text("general", "cancel", this.getUser())%></a>
+                <%=umbraco.ui.Text("general", "cancel", UmbracoUser)%></a>
         </p>
     </asp:Panel>
     <ui:Pane ID="pane_insert" runat="server">
@@ -128,16 +129,16 @@
     </ui:Pane>
     <asp:Panel ID="insert_buttons" runat="server">
         <p>
-            <input type="submit" value="<%=umbraco.ui.Text("general", "ok", this.getUser())%>" />
+            <input type="submit" value="<%=umbraco.ui.Text("general", "ok", UmbracoUser)%>" />
             <em>or </em><a href="#" style="color: blue" onclick="tinyMCEPopup.close();">
-                <%=umbraco.ui.Text("general", "cancel", this.getUser())%></a>
+                <%=umbraco.ui.Text("general", "cancel", UmbracoUser)%></a>
         </p>
     </asp:Panel>
     <div id="renderContent" style="display: none">
         <asp:PlaceHolder ID="renderHolder" runat="server"></asp:PlaceHolder>
     </div>
     </form>
-    <script type="text/javascript" language="javascript">
+    <script type="text/javascript" >
         var inst; // =  tinyMCEPopup.editor;
         var elm; // = inst.selection.getNode();
 
diff --git a/src/Umbraco.Web/HttpRequestExtensions.cs b/src/Umbraco.Web/HttpRequestExtensions.cs
index 3743fd5705..5a71348c2a 100644
--- a/src/Umbraco.Web/HttpRequestExtensions.cs
+++ b/src/Umbraco.Web/HttpRequestExtensions.cs
@@ -11,6 +11,21 @@ namespace Umbraco.Web
 	/// </summary>
 	public static class HttpRequestExtensions
 	{
+        /// <summary>
+        /// Extracts the value from the query string and cleans it to prevent xss attacks.
+        /// </summary>
+        /// <param name="request"></param>
+        /// <param name="key"></param>
+        /// <returns></returns>        
+        public static string GetCleanedItem(this HttpRequest request, string key)
+        {
+            var item = request.GetItemAsString(key);
+            //remove any html
+            item = item.StripHtml();
+            //strip out any potential chars involved with XSS
+            return item.ExceptChars(new HashSet<char>("(){}[];:%<>/\\|&'\"".ToCharArray()));
+        }
+
 		/// <summary>
 		/// Safely get a request item as string, if the item does not exist, an empty string is returned.
 		/// </summary>
diff --git a/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs b/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
new file mode 100644
index 0000000000..bb7b883ba6
--- /dev/null
+++ b/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
@@ -0,0 +1,157 @@
+using System;
+using System.Globalization;
+using System.Linq;
+using System.Web.Mvc;
+using Umbraco.Core.Models;
+using Umbraco.Web.Routing;
+using Umbraco.Core;
+using Language = umbraco.cms.businesslogic.language.Language;
+
+namespace Umbraco.Web.Mvc
+{
+    /// <summary>
+    /// Used for custom routed pages that are being integrated with the Umbraco data but are not
+    /// part of the umbraco request pipeline. This allows umbraco macros to be able to execute in this scenario.
+    /// </summary>
+    /// <remarks>
+    /// This is inspired from this discussion:
+    /// http://our.umbraco.org/forum/developers/extending-umbraco/41367-Umbraco-6-MVC-Custom-MVC-Route?p=3
+    /// 
+    /// which is based on custom routing found here:
+    /// http://shazwazza.com/post/Custom-MVC-routing-in-Umbraco
+    /// </remarks>
+    public class EnsurePublishedContentRequestAttribute : ActionFilterAttribute
+    {
+        private readonly string _dataTokenName;
+        private readonly string _culture;
+        private UmbracoContext _umbracoContext;
+        private readonly int? _contentId;
+        private UmbracoHelper _helper;
+
+        /// <summary>
+        /// Constructor - can be used for testing
+        /// </summary>
+        /// <param name="umbracoContext"></param>
+        /// <param name="contentId"></param>
+        /// <param name="culture"></param>
+        public EnsurePublishedContentRequestAttribute(UmbracoContext umbracoContext, int contentId, string culture = null)
+        {
+            if (umbracoContext == null) throw new ArgumentNullException("umbracoContext");
+            _umbracoContext = umbracoContext;
+            _contentId = contentId;
+            _culture = culture;
+        }
+
+        /// <summary>
+        /// A constructor used to set an explicit content Id to the PublishedContentRequest that will be created
+        /// </summary>
+        /// <param name="contentId"></param>
+        public EnsurePublishedContentRequestAttribute(int contentId)
+        {
+            _contentId = contentId;
+        }
+
+        /// <summary>
+        /// A constructor used to set the data token key name that contains a reference to a PublishedContent instance
+        /// </summary>
+        /// <param name="dataTokenName"></param>
+        public EnsurePublishedContentRequestAttribute(string dataTokenName)
+        {
+            _dataTokenName = dataTokenName;
+        }
+
+        /// <summary>
+        /// Constructor - can be used for testing
+        /// </summary>
+        /// <param name="umbracoContext"></param>
+        /// <param name="dataTokenName"></param>
+        /// <param name="culture"></param>
+        public EnsurePublishedContentRequestAttribute(UmbracoContext umbracoContext, string dataTokenName, string culture = null)
+        {
+            if (umbracoContext == null) throw new ArgumentNullException("umbracoContext");
+            _umbracoContext = umbracoContext;
+            _dataTokenName = dataTokenName;
+            _culture = culture;
+        }
+
+        /// <summary>
+        /// Exposes the UmbracoContext
+        /// </summary>
+        protected UmbracoContext UmbracoContext
+        {
+            get { return _umbracoContext ?? (_umbracoContext = UmbracoContext.Current); }
+        }
+
+        /// <summary>
+        /// Exposes an UmbracoHelper
+        /// </summary>
+        protected UmbracoHelper Umbraco
+        {
+            get { return _helper ?? (_helper = new UmbracoHelper(UmbracoContext.Current)); }
+        }
+
+        public override void OnActionExecuted(ActionExecutedContext filterContext)
+        {
+            base.OnActionExecuted(filterContext);
+
+            //First we need to check if the pcr has been set, if it has we're going to ignore this and not actually do anything
+            if (UmbracoContext.Current.PublishedContentRequest != null)
+            {
+                return;
+            }
+
+            UmbracoContext.Current.PublishedContentRequest =
+                new PublishedContentRequest(
+                    UmbracoContext.Current.CleanedUmbracoUrl, UmbracoContext.Current.RoutingContext);
+
+            ConfigurePublishedContentRequest(UmbracoContext.Current.PublishedContentRequest, filterContext);
+        }
+
+        /// <summary>
+        /// This assigns the published content to the request, developers can override this to specify 
+        /// any other custom attributes required.
+        /// </summary>
+        /// <param name="pcr"></param>
+        /// <param name="filterContext"></param>
+        protected virtual void ConfigurePublishedContentRequest(PublishedContentRequest pcr, ActionExecutedContext filterContext)
+        {
+            if (_contentId.HasValue)
+            {
+                var content = Umbraco.TypedContent(_contentId);
+                if (content == null)
+                {
+                    throw new InvalidOperationException("Could not resolve content with id " + _contentId);
+                }
+                pcr.PublishedContent = content;
+            }
+            else if (_dataTokenName.IsNullOrWhiteSpace() == false)
+            {
+                var result = filterContext.RouteData.DataTokens[_dataTokenName];
+                if (result == null)
+                {
+                    throw new InvalidOperationException("No data token could be found with the name " + _dataTokenName);
+                }
+                if ((result is IPublishedContent) == false)
+                {
+                    throw new InvalidOperationException("The data token resolved with name " + _dataTokenName + " was not an instance of " + typeof(IPublishedContent));
+                }
+                pcr.PublishedContent = (IPublishedContent) result;
+            }
+
+            //need to set the culture for this to work
+            if (_culture.IsNullOrWhiteSpace())
+            {
+                //none specified so get the default
+                var defaultLanguage = Language.GetAllAsList().FirstOrDefault();
+                pcr.Culture = defaultLanguage == null ? CultureInfo.CurrentUICulture : new CultureInfo(defaultLanguage.CultureAlias);
+            }
+            else
+            {
+                pcr.Culture = new CultureInfo(_culture);
+            }
+            
+            pcr.ConfigureRequest();
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Routing/PublishedContentRequest.cs b/src/Umbraco.Web/Routing/PublishedContentRequest.cs
index 655da398bb..08eb2946ef 100644
--- a/src/Umbraco.Web/Routing/PublishedContentRequest.cs
+++ b/src/Umbraco.Web/Routing/PublishedContentRequest.cs
@@ -60,8 +60,22 @@ namespace Umbraco.Web.Routing
 		internal void Prepare()
 		{
 			_engine.PrepareRequest();
+		    ConfigureRequest();
 		}
 
+        /// <summary>
+        /// Called after the request is prepared - after content, templates, etc... have been assigned.
+        /// </summary>
+        /// <remarks>
+        /// This method must be called for the PCR to work, it is automatically called after the PCR is prepared.
+        /// This method has been exposed in case developers need to configure the request manually if they've manually assigned
+        /// a content instance to the PCR. (i.e. in EnsurePublishedContentRequestAttribute )
+        /// </remarks>
+        public void ConfigureRequest()
+        {
+            _engine.ConfigureRequest();
+        }
+
 		/// <summary>
 		/// Updates the request when there is no template to render the content.
 		/// </summary>
diff --git a/src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs b/src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs
index 3cdd7d9adc..63aff23e34 100644
--- a/src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs
+++ b/src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs
@@ -84,18 +84,39 @@ namespace Umbraco.Web.Routing
             // we don't take care of anything so if the content has changed, it's up to the user
             // to find out the appropriate template
 
-            // set the culture on the thread -- again, 'cos it might have changed in the event handler
-			Thread.CurrentThread.CurrentUICulture = Thread.CurrentThread.CurrentCulture = _pcr.Culture;
+            //complete the PCR and assign the remaining values
+		    ConfigureRequest();
+		}
 
-			// if request has been flagged to redirect, or has no content to display,
+        /// <summary>
+        /// Called by PrepareRequest once everything has been discovered, resolved and assigned to the PCR. This method
+        /// finalizes the PCR with the values assigned.
+        /// </summary>
+        /// <remarks>
+        /// This method logic has been put into it's own method in case developers have created a custom PCR or are assigning their own values
+        /// but need to finalize it themselves.
+        /// 
+        /// This method will throw an exception if no content has been assigned
+        /// </remarks>
+        public void ConfigureRequest()
+        {
+            if (_pcr.HasPublishedContent == false)
+            {
+                throw new InvalidOperationException("Cannot configure the request if there is not content assigned");
+            }
+
+            // set the culture on the thread -- again, 'cos it might have changed in the event handler
+            Thread.CurrentThread.CurrentUICulture = Thread.CurrentThread.CurrentCulture = _pcr.Culture;
+
+            // if request has been flagged to redirect, or has no content to display,
             // then return - whoever called us is in charge of actually redirecting
             if (_pcr.IsRedirect || !_pcr.HasPublishedContent)
-				return;
+                return;
 
             // we may be 404 _and_ have a content
 
-			// can't go beyond that point without a PublishedContent to render
-			// it's ok not to have a template, in order to give MVC a chance to hijack routes
+            // can't go beyond that point without a PublishedContent to render
+            // it's ok not to have a template, in order to give MVC a chance to hijack routes
 
             // note - the page() ctor below will cause the "page" to get the value of all its
             // "elements" ie of all the IPublishedContent property. If we use the object value,
@@ -111,7 +132,7 @@ namespace Umbraco.Web.Routing
             // used by many legacy objects
             _routingContext.UmbracoContext.HttpContext.Items["pageID"] = _pcr.PublishedContent.Id;
             _routingContext.UmbracoContext.HttpContext.Items["pageElements"] = _pcr.UmbracoPage.Elements;
-		}
+        }
 
 		/// <summary>
 		/// Updates the request when there is no template to render the content.
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index bde36229aa..7a4f8db39f 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -313,6 +313,7 @@
     <Compile Include="Models\IRenderModel.cs" />
     <Compile Include="Models\RenderModelOfTContent.cs" />
     <Compile Include="Mvc\MinifyJavaScriptResultAttribute.cs" />
+    <Compile Include="Mvc\EnsurePublishedContentRequestAttribute.cs" />
     <Compile Include="Mvc\UmbracoTemplatePageOfTContent.cs" />
     <Compile Include="Mvc\UmbracoViewPage.cs" />
     <Compile Include="Editors\LogController.cs" />
@@ -632,6 +633,15 @@
     <Compile Include="umbraco.presentation\umbraco\developer\Packages\directoryBrowser.aspx.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\emptyTrashcan.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\create.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\AssignDomain.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
     <Compile Include="umbraco.presentation\umbraco\dialogs\AssignDomain2.aspx.cs">
       <DependentUpon>AssignDomain2.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -1312,27 +1322,6 @@
     <Compile Include="umbraco.presentation\umbraco\dialogs\about.aspx.designer.cs">
       <DependentUpon>about.aspx</DependentUpon>
     </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\AssignDomain.aspx.cs">
-      <DependentUpon>AssignDomain.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\AssignDomain.aspx.designer.cs">
-      <DependentUpon>AssignDomain.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\create.aspx.cs">
-      <DependentUpon>create.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\create.aspx.designer.cs">
-      <DependentUpon>create.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\emptyTrashcan.aspx.cs">
-      <DependentUpon>emptyTrashcan.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\emptyTrashcan.aspx.designer.cs">
-      <DependentUpon>emptyTrashcan.aspx</DependentUpon>
-    </Compile>
     <Compile Include="umbraco.presentation\umbraco\dialogs\exportDocumenttype.aspx.cs">
       <DependentUpon>exportDocumenttype.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -1873,13 +1862,6 @@
     <Content Include="umbraco.presentation\umbraco\dialogs\about.aspx">
       <SubType>ASPXCodeBehind</SubType>
     </Content>
-    <Content Include="umbraco.presentation\umbraco\dialogs\AssignDomain.aspx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\dialogs\create.aspx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\dialogs\emptyTrashcan.aspx" />
     <Content Include="umbraco.presentation\umbraco\dialogs\exportDocumenttype.aspx" />
     <Content Include="umbraco.presentation\umbraco\dialogs\imageViewer.aspx" />
     <Content Include="umbraco.presentation\umbraco\dialogs\importDocumenttype.aspx" />
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain.aspx
deleted file mode 100644
index a2ecac4be2..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain.aspx
+++ /dev/null
@@ -1,48 +0,0 @@
-<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master" Codebehind="AssignDomain.aspx.cs" AutoEventWireup="True" Inherits="umbraco.dialogs.AssignDomain" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
-
-<asp:Content ContentPlaceHolderID="head" runat="server">
-<script type="text/javascript">
-	function doSubmit() {document.Form1["ok"].click()}
-	var functionsFrame = this;
-	var tabFrame = this;
-	var isDialog = true;
-	var submitOnEnter = true;
-	</script>
-
-
-</asp:Content>
-
-<asp:Content ContentPlaceHolderID="body" runat="server">
-    <input type="hidden" name="domainId" value="<%=umbraco.helper.Request("editDomain")%>" />
-    
-    <cc1:Feedback ID="FeedBackMessage" runat="server" />
-    
-    <cc1:Pane runat="server" ID="pane_addnew">
-      <cc1:PropertyPanel runat="server" ID="prop_domain" Text="Domain">
-         <asp:TextBox ID="DomainName" runat="server" Width="252px"></asp:TextBox>
-         <asp:RequiredFieldValidator ControlToValidate="DomainName" ErrorMessage="*" ID="DomainValidator" runat="server" Display="Dynamic" />
-         <asp:RegularExpressionValidator ControlToValidate="DomainName" ErrorMessage="*" ID="DomainValidator2" runat="server" Display="Dynamic" /> 
-         <br /><small><%= umbraco.ui.Text("assignDomain", "domainHelp") %></small>
-      </cc1:PropertyPanel>
-      
-      <cc1:PropertyPanel ID="prop_lang" runat="server" Text="language">
-        <asp:DropDownList ID="Languages" runat="server" />
-        <asp:RequiredFieldValidator ControlToValidate="Languages" ErrorMessage="*" ID="LanguageValidator" runat="server" Display="Dynamic" />
-      </cc1:PropertyPanel>
-      
-      <cc1:PropertyPanel runat="server" Text=" ">
-        <asp:Button ID="ok" runat="server" OnClick="SaveDomain"></asp:Button> 
-      </cc1:PropertyPanel>
-    </cc1:Pane>
-    
-    <cc1:Pane ID="pane_edit" runat="server">
-      <cc1:PropertyPanel runat="server">
-                <asp:Literal ID="allDomains" runat="server" />
-      </cc1:PropertyPanel> 
-    </cc1:Pane>
-    
-    <p>
-      <a href="#" onclick="UmbClientMgr.closeModalWindow()"><%= umbraco.ui.Text("defaultdialogs", "closeThisWindow")%></a>
-    </p>
-</asp:Content>
\ No newline at end of file
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain.aspx.cs
index 27d0742baa..0507a6e321 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain.aspx.cs
@@ -1,5 +1,7 @@
-using System;
+using System;
+using System.Globalization;
 using System.Web.UI.WebControls;
+using Umbraco.Web;
 using umbraco.BasePages;
 using umbraco.BusinessLogic;
 using umbraco.cms.businesslogic.language;
@@ -22,23 +24,22 @@ namespace umbraco.dialogs
 
         protected void Page_Load(object sender, EventArgs e)
         {
-            _currentId = int.Parse(helper.Request("id"));
-            prop_domain.Text = ui.Text("assignDomain", "domain", this.getUser());
-            prop_lang.Text = ui.Text("general", "language", this.getUser());
-            pane_addnew.Text = ui.Text("assignDomain", "addNew", this.getUser());
-            pane_edit.Text = ui.Text("assignDomain", "orEdit", this.getUser());
-            
-            // Put user code to initialize the page here
-            if (helper.Request("editDomain").Trim() != "")
+            _currentId = Request.GetItemAs<int>("id");
+            prop_domain.Text = ui.Text("assignDomain", "domain", UmbracoUser);
+            prop_lang.Text = ui.Text("general", "language", UmbracoUser);
+            pane_addnew.Text = ui.Text("assignDomain", "addNew", UmbracoUser);
+            pane_edit.Text = ui.Text("assignDomain", "orEdit", UmbracoUser);
+
+            if (Request.GetItemAsString("editDomain").Trim() != "")
             {
-                _editDomain = int.Parse(helper.Request("editDomain"));
+                _editDomain = Request.GetItemAs<int>("editDomain");
             }
 
-            if (helper.Request("delDomain").Trim() != "")
+            if (Request.GetItemAsString("delDomain").Trim() != "")
             {
-                var d = new Domain(int.Parse(helper.Request("delDomain")));
+                var d = new Domain(Request.GetItemAs<int>("delDomain"));
                 FeedBackMessage.type = uicontrols.Feedback.feedbacktype.success;
-                FeedBackMessage.Text = ui.Text("assignDomain", "domainDeleted", d.Name, getUser());
+                FeedBackMessage.Text = ui.Text("assignDomain", "domainDeleted", d.Name, UmbracoUser);
                 d.Delete();
                 UpdateDomainList();
             }
@@ -46,8 +47,8 @@ namespace umbraco.dialogs
             if (!IsPostBack)
             {
                 // Add caption to button
-                ok.Text = ui.Text("assignDomain", "addNew", getUser());
-              
+                ok.Text = ui.Text("assignDomain", "addNew", UmbracoUser);
+
                 var selectedLanguage = -1;
 
                 // Maybe add editing info - not the best way this is made ;-)
@@ -55,24 +56,24 @@ namespace umbraco.dialogs
                 {
                     var d = new Domain(_editDomain);
                     selectedLanguage = d.Language.id;
-					DomainName.Text = d.Name.StartsWith("*") ? "*" : d.Name;
-                    ok.Text = ui.Text("general", "update", getUser());
+                    DomainName.Text = d.Name.StartsWith("*") ? "*" : d.Name;
+                    ok.Text = ui.Text("general", "update", UmbracoUser);
                 }
 
                 // Add caption to language validator
-                LanguageValidator.ErrorMessage = ui.Text("defaultdialogs", "requiredField", base.getUser()) + "<br/>";
-                DomainValidator.ErrorMessage = ui.Text("defaultdialogs", "requiredField", base.getUser());
+                LanguageValidator.ErrorMessage = ui.Text("defaultdialogs", "requiredField", UmbracoUser) + "<br/>";
+                DomainValidator.ErrorMessage = ui.Text("defaultdialogs", "requiredField", UmbracoUser);
 
-				DomainValidator2.ErrorMessage = ui.Text("assignDomain", "invalidDomain", base.getUser());
-				//DomainValidator2.ValidationExpression = @"^(?i:http[s]?://)?([-\w]+(\.[-\w]+)*)(:\d+)?(/[-\w]*)?$";
-				DomainValidator2.ValidationExpression = @"^(\*|((?i:http[s]?://)?([-\w]+(\.[-\w]+)*)(:\d+)?(/[-\w]*)?))$";
+                DomainValidator2.ErrorMessage = ui.Text("assignDomain", "invalidDomain", UmbracoUser);
+                //DomainValidator2.ValidationExpression = @"^(?i:http[s]?://)?([-\w]+(\.[-\w]+)*)(:\d+)?(/[-\w]*)?$";
+                DomainValidator2.ValidationExpression = @"^(\*|((?i:http[s]?://)?([-\w]+(\.[-\w]+)*)(:\d+)?(/[-\w]*)?))$";
 
-                Languages.Items.Add(new ListItem(ui.Text("general", "choose", base.getUser()), ""));
-                foreach (var l in Language.getAll)
+                Languages.Items.Add(new ListItem(ui.Text("general", "choose", UmbracoUser), ""));
+                foreach (var l in Language.GetAllAsList())
                 {
                     var li = new ListItem();
                     li.Text = l.FriendlyName;
-                    li.Value = l.id.ToString();
+                    li.Value = l.id.ToString(CultureInfo.InvariantCulture);
                     if (selectedLanguage == l.id)
                         li.Selected = true;
                     Languages.Items.Add(li);
@@ -84,7 +85,7 @@ namespace umbraco.dialogs
 
         private void UpdateDomainList()
         {
-            
+
             var domainList = Domain.GetDomainsById(_currentId);
 
             if (domainList.Length > 0)
@@ -95,9 +96,9 @@ namespace umbraco.dialogs
                 {
                     var name = d.Name.StartsWith("*") ? "*" : d.Name;
                     allDomains.Text += "<tr><td>" + name + "</td><td>(" + d.Language.CultureAlias + ")</td><td><a href=\"?id=" + _currentId + "&editDomain=" +
-                                       d.Id.ToString() + "\">" + ui.Text("edit") + "</a></td><td><a href=\"?id=" + _currentId +
-                                       "&delDomain=" + d.Id.ToString() + "\" onClick=\"return confirm('" +
-                                       ui.Text("defaultdialogs", "confirmdelete", base.getUser()) +
+                                       d.Id.ToString(CultureInfo.InvariantCulture) + "\">" + ui.Text("edit") + "</a></td><td><a href=\"?id=" + _currentId +
+                                       "&delDomain=" + d.Id.ToString(CultureInfo.InvariantCulture) + "\" onClick=\"return confirm('" +
+                                       ui.Text("defaultdialogs", "confirmdelete", UmbracoUser) +
                                        "');\" style=\"color: red\">" + ui.Text("delete") + "</a></td></tr>";
                 }
 
@@ -107,7 +108,7 @@ namespace umbraco.dialogs
             else
             {
                 pane_edit.Visible = false;
-            }            
+            }
         }
 
         protected void SaveDomain(object sender, EventArgs e)
@@ -120,7 +121,7 @@ namespace umbraco.dialogs
                     d.Language = new Language(int.Parse(Languages.SelectedValue));
                     d.Name = DomainName.Text.ToLower();
                     FeedBackMessage.type = uicontrols.Feedback.feedbacktype.success;
-                    FeedBackMessage.Text = ui.Text("assignDomain", "domainUpdated", DomainName.Text, getUser());
+                    FeedBackMessage.Text = ui.Text("assignDomain", "domainUpdated", DomainName.Text, UmbracoUser);
                     d.Save();
 
                     DomainName.Text = "";
@@ -132,14 +133,14 @@ namespace umbraco.dialogs
                 }
                 else
                 {
-					// have to handle wildcard
+                    // have to handle wildcard
                     var domainName = DomainName.Text.Trim();
-					domainName = domainName == "*" ? ("*" + _currentId.ToString()) : domainName;
+                    domainName = domainName == "*" ? ("*" + _currentId.ToString(CultureInfo.InvariantCulture)) : domainName;
 
                     if (!Domain.Exists(domainName.ToLower()))
                     {
                         Domain.MakeNew(domainName, _currentId, int.Parse(Languages.SelectedValue));
-                        FeedBackMessage.Text = ui.Text("assignDomain", "domainCreated", domainName, getUser());
+                        FeedBackMessage.Text = ui.Text("assignDomain", "domainCreated", domainName, UmbracoUser);
                         FeedBackMessage.type = uicontrols.Feedback.feedbacktype.success;
 
                         DomainName.Text = "";
@@ -151,12 +152,119 @@ namespace umbraco.dialogs
                     }
                     else
                     {
-                        FeedBackMessage.Text = ui.Text("assignDomain", "domainExists", DomainName.Text.Trim(), getUser());
+                        FeedBackMessage.Text = ui.Text("assignDomain", "domainExists", DomainName.Text.Trim(), UmbracoUser);
                         FeedBackMessage.type = uicontrols.Feedback.feedbacktype.error;
                     }
-                }   
+                }
             }
         }
 
+        /// <summary>
+        /// FeedBackMessage control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::umbraco.uicontrols.Feedback FeedBackMessage;
+
+        /// <summary>
+        /// pane_addnew control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::umbraco.uicontrols.Pane pane_addnew;
+
+        /// <summary>
+        /// prop_domain control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::umbraco.uicontrols.PropertyPanel prop_domain;
+
+        /// <summary>
+        /// DomainName control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox DomainName;
+
+        /// <summary>
+        /// DomainValidator control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.RequiredFieldValidator DomainValidator;
+
+        /// <summary>
+        /// DomainValidator2 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.RegularExpressionValidator DomainValidator2;
+
+        /// <summary>
+        /// prop_lang control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::umbraco.uicontrols.PropertyPanel prop_lang;
+
+        /// <summary>
+        /// Languages control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.DropDownList Languages;
+
+        /// <summary>
+        /// LanguageValidator control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.RequiredFieldValidator LanguageValidator;
+
+        /// <summary>
+        /// ok control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button ok;
+
+        /// <summary>
+        /// pane_edit control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::umbraco.uicontrols.Pane pane_edit;
+
+        /// <summary>
+        /// allDomains control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Literal allDomains;
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain.aspx.designer.cs
deleted file mode 100644
index 07464f0501..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain.aspx.designer.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated. 
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace umbraco.dialogs {
-    
-    
-    public partial class AssignDomain {
-        
-        /// <summary>
-        /// FeedBackMessage control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.Feedback FeedBackMessage;
-        
-        /// <summary>
-        /// pane_addnew control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.Pane pane_addnew;
-        
-        /// <summary>
-        /// prop_domain control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.PropertyPanel prop_domain;
-        
-        /// <summary>
-        /// DomainName control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.TextBox DomainName;
-        
-        /// <summary>
-        /// DomainValidator control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.RequiredFieldValidator DomainValidator;
-        
-        /// <summary>
-        /// DomainValidator2 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.RegularExpressionValidator DomainValidator2;
-        
-        /// <summary>
-        /// prop_lang control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.PropertyPanel prop_lang;
-        
-        /// <summary>
-        /// Languages control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.DropDownList Languages;
-        
-        /// <summary>
-        /// LanguageValidator control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.RequiredFieldValidator LanguageValidator;
-        
-        /// <summary>
-        /// ok control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Button ok;
-        
-        /// <summary>
-        /// pane_edit control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.Pane pane_edit;
-        
-        /// <summary>
-        /// allDomains control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Literal allDomains;
-    }
-}
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/create.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/create.aspx
deleted file mode 100644
index 92e1b86ed3..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/create.aspx
+++ /dev/null
@@ -1,66 +0,0 @@
-<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master" CodeBehind="create.aspx.cs"
-    AutoEventWireup="True" Inherits="umbraco.dialogs.create" %>
-
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
-<%@ Register Src="../controls/Tree/TreeControl.ascx" TagName="TreeControl" TagPrefix="umbraco" %>
-<asp:Content ContentPlaceHolderID="head" runat="server">
-
-    <script language="javascript" type="text/javascript">
-        
-        var pageNameHolder = null;
-        var pageName = null;
-        
-        jQuery(document).ready(function() {
-            pageNameHolder = jQuery("#<%=PageNameHolder.ClientID%>");
-		    pageName = pageNameHolder.find("p");    
-        });
-        
-		function dialogHandler(id) {
-			document.getElementById("nodeId").value = id;
-			document.getElementById("ok").disabled = false;
-			// Get node name by xmlrequest
-			if (id > 0) {
-			    umbraco.presentation.webservices.CMSNode.GetNodeName('<%=umbraco.BasePages.BasePage.umbracoUserContextID%>', id, updateName);
-				}
-			else			
-				pageName.html("<p><strong><%=umbraco.ui.Text(umbraco.helper.Request("app"))%></strong> <%= umbraco.ui.Text("moveOrCopy","nodeSelected") %></p>");
-				pageNameHolder.attr("class","success");
-		}
-		
-		function updateName(result) {			  
-		    pageName.html("<p><strong>" + result + "</strong> <%= umbraco.ui.Text("moveOrCopy","nodeSelected") %></p>");
-			pageNameHolder.attr("class","success");
-		}
-		
-		function onNodeSelectionConfirmed() {
-		    document.location.href = 'create.aspx?nodeType=<%=umbraco.helper.Request("nodeType")%>&app=<%=umbraco.helper.Request("app")%>&nodeId=' + document.getElementById('nodeId').value
-		}
-	
-    </script>
-
-</asp:Content>
-<asp:Content ContentPlaceHolderID="body" runat="server">
-    <input type="hidden" id="nodeId" name="nodeId" value="<%=umbraco.helper.Request("nodeId")%>" />
-    <input type="hidden" id="path" name="path" value="" runat="server" />
-    <cc1:Pane ID="pane_chooseNode" runat="server" Style="overflow: auto; height: 250px;">
-        <umbraco:TreeControl runat="server" ID="JTree" App='<%#umbraco.helper.Request("app") %>'
-            IsDialog="true" DialogMode="id" ShowContextMenu="false" FunctionToCall="dialogHandler"
-            Height="230"></umbraco:TreeControl>
-    </cc1:Pane>
-    <asp:Panel runat="server" ID="panel_buttons">
-        <cc1:Feedback runat="server" ID="PageNameHolder" type="notice" Style="margin-top: 10px;"
-            Text='<%#umbraco.ui.Text("moveOrCopy","noNodeSelected")%>' />
-        <div style="padding-top: 10px;" class="guiDialogNormal">
-            <input type="button" id="ok" value="<%=umbraco.ui.Text("ok")%>" onclick="onNodeSelectionConfirmed();"
-                disabled="true" style="width: 100px" />
-            &nbsp; <em>
-                <%= umbraco.ui.Text("or") %></em>&nbsp; <a href="#" style="color: blue" onclick="UmbClientMgr.closeModalWindow()">
-                    <%=umbraco.ui.Text("cancel")%></a>
-        </div>
-    </asp:Panel>
-    <cc1:Pane ID="pane_chooseName" Visible="false" runat="server">
-        <cc1:PropertyPanel runat="server">
-            <asp:PlaceHolder ID="phCreate" runat="server"></asp:PlaceHolder>
-        </cc1:PropertyPanel>
-    </cc1:Pane>
-</asp:Content>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/create.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/create.aspx.cs
index 7bc9354816..761c9cbe2c 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/create.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/create.aspx.cs
@@ -1,8 +1,10 @@
-using System;
+using System;
 using System.Collections;
 using System.ComponentModel;
 using System.Data;
 using System.Drawing;
+using System.Globalization;
+using System.Linq;
 using System.Web;
 using System.Web.SessionState;
 using System.Web.UI;
@@ -10,7 +12,10 @@ using System.Web.UI.WebControls;
 using System.Web.UI.HtmlControls;
 using System.Xml;
 using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
+using Umbraco.Web;
 using umbraco.cms.businesslogic;
+using umbraco.cms.presentation;
 using umbraco.presentation;
 using umbraco.BusinessLogic.Actions;
 using umbraco.BasePages;
@@ -19,31 +24,47 @@ using Umbraco.Core;
 
 namespace umbraco.dialogs
 {
-	/// <summary>
-	/// Summary description for create.
-	/// </summary>
-	public partial class create : BasePages.UmbracoEnsuredPage
-	{
-		protected System.Web.UI.WebControls.Button ok;
+    /// <summary>
+    /// Summary description for create.
+    /// </summary>
+    public partial class create : UmbracoEnsuredPage
+    {
+        protected Button ok;
 
-		protected void Page_Load(object sender, System.EventArgs e)
-		{
-			// Put user code to initialize the page here
-			if (helper.Request("nodeId") == "") 
-			{
-			
-				string appType = ui.Text("sections", helper.Request("app")).ToLower();
-                pane_chooseNode.Text = ui.Text("create", "chooseNode", appType, this.getUser()) + "?";
+        private string _app;
+        protected string App
+        {
+            get
+            {
+                if (_app == null)
+                {
+                    _app = Request.GetCleanedItem("app");
+                    //validate the app
+                    if (BusinessLogic.Application.getAll().Any(x => x.alias.InvariantEquals(_app)) == false)
+                    {
+                        throw new InvalidOperationException("A requested app: " + Request.GetItemAsString("app") + " was not found");
+                    }
+                }
+                return _app;
+            }
+        }
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            // Put user code to initialize the page here
+            if (Request.GetItemAsString("nodeId") == "")
+            {
+                var appType = ui.Text("sections", App).ToLower();
+                pane_chooseNode.Text = ui.Text("create", "chooseNode", appType, UmbracoUser) + "?";
 
                 DataBind();
-			} 
-			else 
-			{
-                int nodeId = int.Parse(helper.Request("nodeId"));
+            }
+            else
+            {
+                int nodeId = Request.GetItemAs<int>("nodeId");
                 //ensure they have access to create under this node!!
-                if (helper.Request("app") == Constants.Applications.Media || CheckCreatePermissions(nodeId))
+                if (App.InvariantEquals(Constants.Applications.Media) || CheckCreatePermissions(nodeId))
                 {
-                    //pane_chooseName.Text = ui.Text("create", "updateData", this.getUser());
                     var c = new CMSNode(nodeId);
                     path.Value = c.Path;
                     pane_chooseNode.Visible = false;
@@ -55,31 +76,95 @@ namespace umbraco.dialogs
                     defReader.Close();
 
                     // Find definition for current nodeType
-                    XmlNode def = createDef.SelectSingleNode("//nodeType [@alias = '" + Request.QueryString["app"] + "']");
+                    XmlNode def = createDef.SelectSingleNode("//nodeType [@alias = '" + App + "']");
                     phCreate.Controls.Add(new UserControl().LoadControl(IOHelper.ResolveUrl(SystemDirectories.Umbraco) + def.SelectSingleNode("./usercontrol").FirstChild.Value));
                 }
                 else
-                {                    
-                    PageNameHolder.type = umbraco.uicontrols.Feedback.feedbacktype.error;
+                {
+                    PageNameHolder.type = uicontrols.Feedback.feedbacktype.error;
                     PageNameHolder.Text = ui.GetText("rights") + " " + ui.GetText("error");
                     JTree.DataBind();
                 }
-			}
-                        
-		}
+            }
 
-        protected override void OnPreRender(EventArgs e) {
+        }
+
+        protected override void OnPreRender(EventArgs e)
+        {
             base.OnPreRender(e);
 
-            ScriptManager.GetCurrent(Page).Services.Add(new ServiceReference( IOHelper.ResolveUrl( SystemDirectories.WebServices) +"/cmsnode.asmx"));
-            ScriptManager.GetCurrent(Page).Services.Add(new ServiceReference( IOHelper.ResolveUrl( SystemDirectories.WebServices) +"/legacyAjaxCalls.asmx"));
+            ScriptManager.GetCurrent(Page).Services.Add(new ServiceReference(IOHelper.ResolveUrl(SystemDirectories.WebServices) + "/cmsnode.asmx"));
+            ScriptManager.GetCurrent(Page).Services.Add(new ServiceReference(IOHelper.ResolveUrl(SystemDirectories.WebServices) + "/legacyAjaxCalls.asmx"));
         }
 
         private bool CheckCreatePermissions(int nodeId)
         {
-            return UmbracoEnsuredPage.CurrentUser.GetPermissions(new CMSNode(nodeId).Path)
-                .Contains(ActionNew.Instance.Letter.ToString());
+            return CurrentUser.GetPermissions(new CMSNode(nodeId).Path)
+                .Contains(ActionNew.Instance.Letter.ToString(CultureInfo.InvariantCulture));
         }
 
-	}
+
+        /// <summary>
+        /// path control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputHidden path;
+
+        /// <summary>
+        /// pane_chooseNode control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::umbraco.uicontrols.Pane pane_chooseNode;
+
+        /// <summary>
+        /// JTree control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::umbraco.controls.Tree.TreeControl JTree;
+
+        /// <summary>
+        /// panel_buttons control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Panel panel_buttons;
+
+        /// <summary>
+        /// PageNameHolder control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::umbraco.uicontrols.Feedback PageNameHolder;
+
+        /// <summary>
+        /// pane_chooseName control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::umbraco.uicontrols.Pane pane_chooseName;
+
+        /// <summary>
+        /// phCreate control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.PlaceHolder phCreate;
+    }
 }
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/create.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/create.aspx.designer.cs
deleted file mode 100644
index 980534866e..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/create.aspx.designer.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:2.0.50727.4200
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace umbraco.dialogs {
-    
-    
-    public partial class create {
-        
-        /// <summary>
-        /// path control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlInputHidden path;
-        
-        /// <summary>
-        /// pane_chooseNode control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.Pane pane_chooseNode;
-        
-        /// <summary>
-        /// JTree control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.controls.Tree.TreeControl JTree;
-        
-        /// <summary>
-        /// panel_buttons control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Panel panel_buttons;
-        
-        /// <summary>
-        /// PageNameHolder control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.Feedback PageNameHolder;
-        
-        /// <summary>
-        /// pane_chooseName control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.Pane pane_chooseName;
-        
-        /// <summary>
-        /// phCreate control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.PlaceHolder phCreate;
-    }
-}
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/emptyTrashcan.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/emptyTrashcan.aspx
deleted file mode 100644
index 8570f00910..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/emptyTrashcan.aspx
+++ /dev/null
@@ -1,82 +0,0 @@
-<%@ Page Language="C#" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="true" CodeBehind="emptyTrashcan.aspx.cs" Inherits="umbraco.presentation.dialogs.emptyTrashcan" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
-
-<asp:Content ContentPlaceHolderID="head" runat="server">
-		<script type="text/javascript">
-		
-		    var recycleBinType = '<%=umbraco.helper.Request("type")%>';
-		    var emptyTotal = '<%= umbraco.cms.businesslogic.RecycleBin.Count((umbraco.cms.businesslogic.RecycleBin.RecycleBinType) Enum.Parse(typeof(umbraco.cms.businesslogic.RecycleBin.RecycleBinType), umbraco.helper.Request("type"), true)).ToString()%>';
-		    
-		    function emptyRecycleBin() {
-    			jQuery('#formDiv').hide();
-    			jQuery('#buttons').hide(); 
-	    		jQuery('#animation').show(); 
-		    	jQuery('#anim').attr("src","<%=umbraco.GlobalSettings.ClientPath%>/images/progressBar.gif");
-		    	
-		    	// call the empty trashcan webservice
-		    	umbraco.presentation.webservices.trashcan.EmptyTrashcan(recycleBinType);
-
-         // wait one second to start the status update
-         setTimeout('updateStatus();', 1000);
-		    }
-		    
-		    function updateStatus() {
-		        umbraco.presentation.webservices.trashcan.GetTrashStatus(updateStatusLabel, failure);
-		    }
-		    
-		    function failure(retVal) {
-		        alert('error: ' + retVal);
-		    }
-		    
-		    function updateStatusLabel(retVal) {
-                jQuery('#statusLabel').html("<strong>" + retVal + " <%=umbraco.ui.Text("remaining")%></strong>");            
-
-                if (retVal != '' && retVal != '0') {
-                    setTimeout('updateStatus();', 500);
-                } else {
-                    jQuery('#div_form').hide();
-                    jQuery('#notification').show();
-                    jQuery('#notification').html("<p><%=umbraco.ui.Text("defaultdialogs", "recycleBinIsEmpty")%> </p> <p><a href='#' onclick='UmbClientMgr.closeModalWindow()'><%= umbraco.ui.Text("defaultdialogs", "closeThisWindow")%></a></p>");
-                    UmbClientMgr.mainTree().reloadActionNode();
-                }
-                
-		    }
-		</script>
-</asp:Content>
-
-<asp:Content runat="server" ContentPlaceHolderID="body">
-    
- 		
-  	<div class="success" id="notification" style="display: none;"></div>
-		
-		<div id="div_form">
-		<cc1:Pane id="pane_form" runat="server">
-		<cc1:PropertyPanel runat="server">
-		
-		
-		
-		<div id="animation" align="center" style="display: none;">
-		<p><%= umbraco.ui.Text("defaultdialogs", "recycleBinDeleting")%></p>
-		
-		<cc1:ProgressBar ID="progbar" runat="server" Title="Please wait..." />
-		<br />
-		<span class="guiDialogTiny" id="statusLabel"><%=umbraco.ui.Text("deleting", this.getUser())%></span>
-		</div>
-	  	  	  
-	  <div id="formDiv">
-	    <p><%= umbraco.ui.Text("defaultdialogs", "recycleBinWarning")%></p>
-		   <input type="checkbox" id="confirmDelete" onclick="$get('ok').disabled = !this.checked;" /> <label for="confirmDelete"><%=umbraco.ui.Text("defaultdialogs", "confirmEmptyTrashcan", umbraco.cms.businesslogic.RecycleBin.Count((umbraco.cms.businesslogic.RecycleBin.RecycleBinType)Enum.Parse(typeof(umbraco.cms.businesslogic.RecycleBin.RecycleBinType), umbraco.helper.Request("type"), true)).ToString(), this.getUser())%></label>
-		</div>
-	  </cc1:PropertyPanel>
-	  </cc1:Pane>
-	  
-		<br />
-		<div id="buttons">
-		<input type="button" ID="ok" value="<%=umbraco.ui.Text("actions", "emptyTrashcan", this.getUser()) %>" class="guiInputButton" onclick="if ($get('confirmDelete').checked) {emptyRecycleBin();}" disabled="true" />  
-		<em><%= umbraco.ui.Text("or") %></em> 
-    <a href="#" onclick="UmbClientMgr.closeModalWindow();">
-      <%=umbraco.ui.Text("cancel")%>
-    </a>
-		</div>
-		</div>
-</asp:Content>
\ No newline at end of file
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/emptyTrashcan.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/emptyTrashcan.aspx.cs
index 8eb2f2c9ab..998a171d71 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/emptyTrashcan.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/emptyTrashcan.aspx.cs
@@ -1,18 +1,33 @@
-using System;
+using System;
 using System.Web.UI;
+using Umbraco.Core;
+using Umbraco.Web;
 using umbraco.BasePages;
+using umbraco.cms.businesslogic;
 
 namespace umbraco.presentation.dialogs
 {
     public partial class emptyTrashcan : UmbracoEnsuredPage
     {
+        private RecycleBin.RecycleBinType? _binType;
+        protected RecycleBin.RecycleBinType BinType
+        {
+            get
+            {
+                if (_binType == null)
+                {
+                    _binType = Enum<RecycleBin.RecycleBinType>.Parse(Request.GetItemAsString("type"), true);
+                }
+                return _binType.Value;
+            }
+        }
 
         protected override void OnInit(EventArgs e)
         {
             base.OnInit(e);
 
             var recycleBinType = helper.Request("type");
-            if (!ValidateUserApp(recycleBinType))
+            if (ValidateUserApp(recycleBinType) == false)
             {
                 throw new InvalidOperationException("The user does not have access to the requested app");
             }
@@ -29,5 +44,23 @@ namespace umbraco.presentation.dialogs
             ScriptManager.GetCurrent(Page).Services.Add(new ServiceReference("../webservices/trashcan.asmx"));
             ScriptManager.GetCurrent(Page).Services.Add(new ServiceReference("../webservices/legacyAjaxCalls.asmx"));
         }
+
+        /// <summary>
+        /// pane_form control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::umbraco.uicontrols.Pane pane_form;
+
+        /// <summary>
+        /// progbar control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::umbraco.uicontrols.ProgressBar progbar;
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/emptyTrashcan.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/emptyTrashcan.aspx.designer.cs
deleted file mode 100644
index bddf439773..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/emptyTrashcan.aspx.designer.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:2.0.50727.4927
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace umbraco.presentation.dialogs {
-    
-    
-    public partial class emptyTrashcan {
-        
-        /// <summary>
-        /// pane_form control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.Pane pane_form;
-        
-        /// <summary>
-        /// progbar control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.ProgressBar progbar;
-    }
-}
diff --git a/src/umbraco.providers/members/MembersMembershipProvider.cs b/src/umbraco.providers/members/MembersMembershipProvider.cs
index e6eb61d018..187baf2845 100644
--- a/src/umbraco.providers/members/MembersMembershipProvider.cs
+++ b/src/umbraco.providers/members/MembersMembershipProvider.cs
@@ -1052,4 +1052,34 @@ namespace umbraco.providers.members
             }            
         }
     }
+
+    //TODO: We need to re-enable this in 6.2, but need to back port most of the membership provider changes (still in a custom branch atm)
+
+    ///// <summary>
+    ///// Adds some event handling
+    ///// </summary>
+    //public class MembershipEventHandler : ApplicationEventHandler
+    //{
+    //    protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
+    //    {
+    //        Member.New += Member_New;
+    //    }
+
+    //    void Member_New(Member sender, NewEventArgs e)
+    //    {
+    //        //This is a bit of a hack to ensure that the member is approved when created since many people will be using
+    //        // this old api to create members on the front-end and they need to be approved - which is based on whether or not 
+    //        // the Umbraco membership provider is configured.
+    //        var provider = Membership.Provider as UmbracoMembershipProvider;
+    //        if (provider != null)
+    //        {
+    //            var approvedField = provider.ApprovedPropertyTypeAlias;
+    //            var property = sender.getProperty(approvedField);
+    //            if (property != null)
+    //            {
+    //                property.Value = 1;
+    //            }
+    //        }            
+    //    }
+    //}
 }