diff --git a/config/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.delete.desc.xml b/config/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.delete.desc.xml
index 247b58f32d..522d20453b 100644
--- a/config/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.delete.desc.xml
+++ b/config/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.delete.desc.xml
@@ -12,6 +12,10 @@
   <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}</url>
   <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}</url>
   <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}/</url>
+  <!-- bug fix REPO-855 -->
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}/{leftover}</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}/{leftover}/</url>
+  <!-- -->
   <authentication>user</authentication>
   <format default="json">argument</format>
   <!-- Note: the transaction is created in AbstractResourceWebScript -->
diff --git a/config/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.get.desc.xml b/config/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.get.desc.xml
index 9828e3bf30..9281827c0d 100644
--- a/config/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.get.desc.xml
+++ b/config/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.get.desc.xml
@@ -12,6 +12,10 @@
   <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}</url>
   <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}</url>
   <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}/</url>
+  <!-- bug fix REPO-855 -->
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}/{leftover}</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}/{leftover}/</url>
+  <!-- -->
   <authentication>user</authentication>
   <format default="json">argument</format>
   <!-- Note: the transaction is created in AbstractResourceWebScript -->
diff --git a/config/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.post.desc.xml b/config/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.post.desc.xml
index 460eac4aa4..17cadf1213 100644
--- a/config/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.post.desc.xml
+++ b/config/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.post.desc.xml
@@ -12,6 +12,10 @@
   <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}</url>
   <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}</url>
   <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}/</url>
+  <!-- bug fix REPO-855 -->
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}/{leftover}</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}/{leftover}/</url>
+  <!-- -->
   <authentication>user</authentication>
   <format default="json">argument</format>
   <!-- Note: the transaction is created in AbstractResourceWebScript -->
diff --git a/config/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.put.desc.xml b/config/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.put.desc.xml
index 5e531c1c19..d611c14ed7 100644
--- a/config/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.put.desc.xml
+++ b/config/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.put.desc.xml
@@ -12,6 +12,10 @@
   <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}</url>
   <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}</url>
   <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}/</url>
+  <!-- bug fix REPO-855 -->
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}/{leftover}</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}/{leftover}/</url>
+  <!-- -->
   <authentication>user</authentication>
   <format default="json">argument</format>
   <!-- Note: the transaction is created in AbstractResourceWebScript -->
diff --git a/source/java/org/alfresco/rest/api/people/PersonPreferencesRelation.java b/source/java/org/alfresco/rest/api/people/PersonPreferencesRelation.java
index 0a2eaf92f1..b5ca948cf2 100644
--- a/source/java/org/alfresco/rest/api/people/PersonPreferencesRelation.java
+++ b/source/java/org/alfresco/rest/api/people/PersonPreferencesRelation.java
@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Remote API
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software. 
- * If the software was purchased under a paid Alfresco license, the terms of 
- * the paid license agreement will prevail.  Otherwise, the software is 
- * provided under the following open source license terms:
- * 
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
 package org.alfresco.rest.api.people;
 
 import org.alfresco.rest.api.Preferences;
@@ -80,6 +80,13 @@ public class PersonPreferencesRelation implements RelationshipResourceAction.Rea
     @WebApiDescription(title = "Preference value for preference 'preferenceName' for person 'personId'.")
     public Preference readById(String personId, String preferenceName, Parameters parameters)
 	{
+        // fix for REPO-855
+		String url = parameters.getRequest().getURL();
+		if(url.matches(".*workspace://SpacesStore/.*")){
+            preferenceName += url.substring(url.indexOf("//SpacesStore/"));
+        }
+		//
+
     	return preferences.getPreference(personId, preferenceName);
 	}
 
diff --git a/source/test-java/org/alfresco/rest/api/tests/TestUserPreferences.java b/source/test-java/org/alfresco/rest/api/tests/TestUserPreferences.java
index e4356d70bb..4bc1d301e0 100644
--- a/source/test-java/org/alfresco/rest/api/tests/TestUserPreferences.java
+++ b/source/test-java/org/alfresco/rest/api/tests/TestUserPreferences.java
@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Remote API
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software. 
- * If the software was purchased under a paid Alfresco license, the terms of 
- * the paid license agreement will prevail.  Otherwise, the software is 
- * provided under the following open source license terms:
- * 
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
 package org.alfresco.rest.api.tests;
 
 import static org.junit.Assert.assertEquals;
@@ -95,6 +95,8 @@ public class TestUserPreferences extends EnterpriseTestApi
         expectedPreferences.add(new Preference("org.alfresco.share.documentList.testPreference1", String.valueOf(true)));
         expectedPreferences.add(new Preference("org.alfresco.share.documentList.sortAscending", String.valueOf(true)));
         expectedPreferences.add(new Preference("org.alfresco.share.documentList.testPreference3", String.valueOf(true)));
+		// new preference name for issue REPO-855
+		expectedPreferences.add(new Preference("org.alfresco.ext.folders.favourites.workspace://SpacesStore/4e3d0779-388a-4b94-91e1-eab588a7da3d.createdAt", String.valueOf(true)));
 
 		TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
 		{