diff --git a/src/Umbraco.Core/SystemUtilities.cs b/src/Umbraco.Core/SystemUtilities.cs
index 5146aade59..77ff1c8ba6 100644
--- a/src/Umbraco.Core/SystemUtilities.cs
+++ b/src/Umbraco.Core/SystemUtilities.cs
@@ -8,6 +8,8 @@ namespace Umbraco.Core
 	/// </summary>
 	public static class SystemUtilities
 	{
+	    private static bool _knowTrustLevel;
+	    private static AspNetHostingPermissionLevel _trustLevel;
 
 		/// <summary>
 		/// Get the current trust level of the hosted application
@@ -15,6 +17,8 @@ namespace Umbraco.Core
 		/// <returns></returns>
 		public static AspNetHostingPermissionLevel GetCurrentTrustLevel()
 		{
+		    if (_knowTrustLevel) return _trustLevel;
+
 			foreach (var trustLevel in new[] {
 			                                 	AspNetHostingPermissionLevel.Unrestricted,
 			                                 	AspNetHostingPermissionLevel.High,
@@ -31,10 +35,14 @@ namespace Umbraco.Core
 					continue;
 				}
 
-				return trustLevel;
+                _trustLevel = trustLevel;
+			    _knowTrustLevel = true;
+			    return _trustLevel;
 			}
 
-			return AspNetHostingPermissionLevel.None;
-		}
+			_trustLevel = AspNetHostingPermissionLevel.None;
+            _knowTrustLevel = true;
+            return _trustLevel;
+        }
 	}
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index 19b1af5933..56c55e99d3 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -308,7 +308,7 @@
     <key alias="alias">Alias</key>
     <key alias="areyousure">Are you sure?</key>
     <key alias="border">Border</key>
-    <key alias="by">or</key>
+    <key alias="by">by</key>
     <key alias="cancel">Cancel</key>
     <key alias="cellMargin">Cell margin</key>
     <key alias="choose">Choose</key>
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index bac4a484f6..fbbc53fbf9 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -1949,8 +1949,6 @@
     <Content Include="umbraco.presentation\umbraco\developer\Xslt\xsltChooseExtension.aspx" />
     <Content Include="umbraco.presentation\umbraco\developer\Xslt\xsltInsertValueOf.aspx" />
     <Content Include="umbraco.presentation\umbraco\js\language.aspx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
     <Content Include="umbraco.presentation\umbraco\members\EditMemberGroup.aspx">
       <SubType>Form</SubType>
     </Content>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx.cs
index cbe0ab3d7f..8287af0eb0 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx.cs
@@ -34,7 +34,7 @@ namespace umbraco.presentation.dialogs
                 Document rollback = new Document(currentDoc.Id, new Guid(allVersions.SelectedValue));
 
                 propertiesCompare.Text = "<tr><th style='width: 25%;' valign='top'>" + ui.Text("general", "name") + ":</th><td>" + rollback.Text + "</td></tr>";
-                propertiesCompare.Text += "<tr><th style='width: 25%;' valign='top'>" + ui.Text("content", "createDate") + ":</th><td>" + rollback.VersionDate.ToLongDateString() + " " + rollback.VersionDate.ToLongTimeString() + ui.Text("general", "by") + ": " + rollback.User.Name + "</td></tr>";
+                propertiesCompare.Text += "<tr><th style='width: 25%;' valign='top'>" + ui.Text("content", "createDate") + ":</th><td>" + rollback.VersionDate.ToLongDateString() + " " + rollback.VersionDate.ToLongTimeString() + " " + ui.Text("general", "by") + ": " + rollback.User.Name + "</td></tr>";
 
                 if (rbl_mode.SelectedValue == "diff")
                     lt_notice.Text = ui.Text("rollback", "diffHelp");