diff --git a/source/java/org/alfresco/web/app/servlet/FacesHelper.java b/source/java/org/alfresco/web/app/servlet/FacesHelper.java
index 1b592588da..1cc7326c42 100644
--- a/source/java/org/alfresco/web/app/servlet/FacesHelper.java
+++ b/source/java/org/alfresco/web/app/servlet/FacesHelper.java
@@ -171,6 +171,7 @@ public final class FacesHelper
          id = id.replace(':', '_');
          id = id.replace(' ', '_');
          id = id.replace('.', '_');
+         id = id.replace('+', '_');
          
          // TODO: check all other illegal characters - only allowed dash and underscore
          // TODO: use regular expression to do check and replacment of characters
diff --git a/source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java b/source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java
index 52160aab01..ca99e60385 100644
--- a/source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java
+++ b/source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java
@@ -722,7 +722,7 @@ public class UIUserSandboxes extends SelfRenderingComponent
                   out.write(name);
                   UIAVMLockIcon lockIcon = (UIAVMLockIcon)fc.getApplication().createComponent(
                         UIAVMLockIcon.ALFRESCO_FACES_AVMLOCKICON);
-                  lockIcon.setId("lock_" + FacesHelper.makeLegalId(name));
+                  lockIcon.setId("avmlock_" + Integer.toString(rowIndex));
                   lockIcon.setValue(sourcePath);
                   Utils.encodeRecursive(fc, lockIcon);
                   out.write("</a>");