diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/permissions.get.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/permissions.get.js
index 1cc10c68f4..3db6b1dbf4 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/permissions.get.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/permissions.get.js
@@ -66,7 +66,7 @@ function parsePermissions(p_permissions, p_settable)
 {
    var results = [],
       settable = {},
-      tokens, authority, authorityId, nameProperty, role, i, ii;
+      tokens, authority, authorityId, role, i, ii;
 
    // Settable array into object for "x in y" style operations
    for (i = 0, ii = p_settable.length; i < ii; i++)
@@ -90,7 +90,6 @@ function parsePermissions(p_permissions, p_settable)
          if (authorityId.indexOf("GROUP_") === 0)
          {
             authority = Common.getGroup(authorityId);
-            nameProperty = "shortName";
          }
          else if (authorityId.indexOf("ROLE_") === 0)
          {
@@ -104,7 +103,6 @@ function parsePermissions(p_permissions, p_settable)
          else
          {
             authority = Common.getPerson(authorityId);
-            nameProperty = "displayName";
          }
       
          if (authority != null)
@@ -115,7 +113,7 @@ function parsePermissions(p_permissions, p_settable)
                {
                   avatar: authority.avatar || null,
                   name: authorityId,
-                  displayName: authority[nameProperty]
+                  displayName: authority["displayName"]
                },
                role: role
             });
diff --git a/source/java/org/alfresco/repo/web/scripts/wiki/AbstractWikiWebScript.java b/source/java/org/alfresco/repo/web/scripts/wiki/AbstractWikiWebScript.java
index 92e2229a18..96ebad322e 100644
--- a/source/java/org/alfresco/repo/web/scripts/wiki/AbstractWikiWebScript.java
+++ b/source/java/org/alfresco/repo/web/scripts/wiki/AbstractWikiWebScript.java
@@ -40,6 +40,7 @@ import org.apache.commons.logging.LogFactory;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
+import org.springframework.extensions.surf.util.URLEncoder;
 import org.springframework.extensions.webscripts.Cache;
 import org.springframework.extensions.webscripts.DeclarativeWebScript;
 import org.springframework.extensions.webscripts.Status;
@@ -140,7 +141,7 @@ public abstract class AbstractWikiWebScript extends DeclarativeWebScript
           JSONWriter activity = new JSONWriter(activityJson);
           activity.startObject();
           activity.writeValue("title", wikiPage.getTitle());
-          activity.writeValue("page", page + "?title=" + wikiPage.getSystemName());
+          activity.writeValue("page", page + "?title=" + URLEncoder.encodeUriComponent(wikiPage.getSystemName()));
           activity.endObject();
           
           activityService.postActivity(
diff --git a/source/java/org/alfresco/repo/webdav/WebDAV.java b/source/java/org/alfresco/repo/webdav/WebDAV.java
index 99085310e2..7dcddc789e 100644
--- a/source/java/org/alfresco/repo/webdav/WebDAV.java
+++ b/source/java/org/alfresco/repo/webdav/WebDAV.java
@@ -19,7 +19,6 @@
 package org.alfresco.repo.webdav;
 
 import java.io.Serializable;
-import java.net.URLDecoder;
 import java.util.Date;
 import java.util.Hashtable;
 import java.util.Locale;
@@ -368,7 +367,7 @@ public class WebDAV
         
         try 
         {
-            strPath = URLDecoder.decode( request.getRequestURI(), "UTF-8");
+            strPath = WebDAVHelper.decodeURL(request.getRequestURI());
         }
         catch (Exception ex) {}
 
@@ -503,7 +502,7 @@ public class WebDAV
 
         try
         {
-            strNormalized = URLDecoder.decode(strPath, "UTF-8");
+            strNormalized = WebDAVHelper.decodeURL(strPath);
         }
         catch (Exception ex)
         {