diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/invite/invite.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/invite/invite.get.json.ftl
index c0ba334809..8513485bc6 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/invite/invite.get.json.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/invite/invite.get.json.ftl
@@ -1,3 +1,4 @@
+<#escape x as jsonUtils.encodeJSONString(x)>
 {
    "action" : "${action}",
    <#if inviteId??>
@@ -21,4 +22,5 @@
    <#if siteShortName??>
       "siteShortName" : "${siteShortName}"
    </#if>
-}
\ No newline at end of file
+}
+</#escape>
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/action.lib.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/action.lib.js
index 8a5845c07a..ece4b6bc79 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/action.lib.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/action.lib.js
@@ -36,11 +36,11 @@ function main()
 
    // Resolve path if available
    var path = url.templateArgs.path;
-	// Path might be null for the root folder
-	if (!path)
-	{
-	   path = "";
-	}
+   // Path might be null for the root folder
+   if (!path)
+   {
+      path = "";
+   }
    // Remove any leading or trailing "/" from the path
    // Fix-up parent path to have no leading or trailing slashes
    if (path.length > 0)