diff --git a/config/alfresco/templates/webscripts/org/alfresco/portlets/doclist.get.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/portlets/doclist.get.desc.xml
index ad5029ada8..20c1dc0c2f 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/portlets/doclist.get.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/portlets/doclist.get.desc.xml
@@ -1,8 +1,8 @@
 <webscript>
   <shortname>Document List</shortname>
   <description>Generate the Document list portlet page</description>
-  <url>/doclist?f={filter?}&amp;p={path?}&amp;q={query?}</url>
-  <url>/doclist.atom?f={filter?}&amp;p={path?}&amp;q={query?}</url>
+  <url>/ui/doclist?f={filter?}&amp;p={path?}&amp;q={query?}</url>
+  <url>/ui/doclist.atom?f={filter?}&amp;p={path?}&amp;q={query?}</url>
   <authentication>user</authentication>
   <transaction>required</transaction>
 </webscript>
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/portlets/doclistpanel.get.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/portlets/doclistpanel.get.desc.xml
index 94852cd952..957e30b2bd 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/portlets/doclistpanel.get.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/portlets/doclistpanel.get.desc.xml
@@ -1,7 +1,7 @@
 <webscript>
   <shortname>Document List Panel</shortname>
   <description>Generate the inner panel for the Document List portlet page</description>
-  <url>/doclistpanel?f={filter}&amp;p={path}&amp;h={home};q={query?}</url>
+  <url>/ui/doclistpanel?f={filter}&amp;p={path}&amp;h={home};q={query?}</url>
   <authentication>user</authentication>
   <transaction>required</transaction>
 </webscript>
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/portlets/myspaces.get.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/portlets/myspaces.get.desc.xml
index e45411f9d5..7883bca178 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/portlets/myspaces.get.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/portlets/myspaces.get.desc.xml
@@ -1,7 +1,7 @@
 <webscript>
   <shortname>My Spaces</shortname>
   <description>Generate the My Spaces portlet page</description>
-  <url>/myspaces?f={filter?}&amp;p={path?}</url>
+  <url>/ui/myspaces?f={filter?}&amp;p={path?}</url>
   <authentication>user</authentication>
   <transaction>required</transaction>
 </webscript>
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/portlets/myspacespanel.get.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/portlets/myspacespanel.get.desc.xml
index e352b709de..7f8f42e2f9 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/portlets/myspacespanel.get.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/portlets/myspacespanel.get.desc.xml
@@ -1,7 +1,7 @@
 <webscript>
   <shortname>My Spaces Panel</shortname>
   <description>Generate the inner panel for the My Spaces portlet page</description>
-  <url>/myspacespanel?f={filter}&amp;p={path}&amp;h={home}</url>
+  <url>/ui/myspacespanel?f={filter}&amp;p={path}&amp;h={home}</url>
   <authentication>user</authentication>
   <transaction>required</transaction>
 </webscript>
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/portlets/mytasks.get.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/portlets/mytasks.get.desc.xml
index c6ba362657..248b09b1af 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/portlets/mytasks.get.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/portlets/mytasks.get.desc.xml
@@ -1,7 +1,7 @@
 <webscript>
   <shortname>My Tasks</shortname>
   <description>Generate the My Tasks portlet page</description>
-  <url>/mytasks?f={filter?}</url>
+  <url>/ui/mytasks?f={filter?}</url>
   <authentication>user</authentication>
   <transaction>required</transaction>
 </webscript>
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/portlets/mytaskspanel.get.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/portlets/mytaskspanel.get.desc.xml
index 1d21a8c46a..dc838f5668 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/portlets/mytaskspanel.get.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/portlets/mytaskspanel.get.desc.xml
@@ -1,7 +1,7 @@
 <webscript>
   <shortname>My Tasks Panel</shortname>
   <description>Generate the Generate the inner panel for the My Tasks portlet page</description>
-  <url>/mytaskspanel?f={filter?}</url>
+  <url>/ui/mytaskspanel?f={filter?}</url>
   <authentication>user</authentication>
   <transaction>required</transaction>
 </webscript>
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/portlets/mywebforms.get.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/portlets/mywebforms.get.desc.xml
index 83657ae268..bc22ee7820 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/portlets/mywebforms.get.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/portlets/mywebforms.get.desc.xml
@@ -1,7 +1,7 @@
 <webscript>
   <shortname>My Web Forms</shortname>
   <description>Generate the My Web Forms portlet page</description>
-  <url>/mywebforms</url>
+  <url>/ui/mywebforms</url>
   <authentication>user</authentication>
   <transaction>required</transaction>
 </webscript>
\ No newline at end of file
diff --git a/source/web/WEB-INF/portlet.xml b/source/web/WEB-INF/portlet.xml
index 4ea642598c..920c521958 100644
--- a/source/web/WEB-INF/portlet.xml
+++ b/source/web/WEB-INF/portlet.xml
@@ -33,7 +33,7 @@
         </init-param>
         <init-param>
            <name>scriptUrl</name>
-           <value>/alfresco/168s/mytasks</value>
+           <value>/alfresco/168s/ui/mytasks</value>
         </init-param>
 
         <supports>
@@ -58,7 +58,7 @@
         </init-param>
         <init-param>
            <name>scriptUrl</name>
-           <value>/alfresco/168s/doclist</value>
+           <value>/alfresco/168s/ui/doclist</value>
         </init-param>
 
         <supports>
@@ -83,7 +83,7 @@
         </init-param>
         <init-param>
            <name>scriptUrl</name>
-           <value>/alfresco/168s/myspaces</value>
+           <value>/alfresco/168s/ui/myspaces</value>
         </init-param>
 
         <supports>
@@ -108,7 +108,7 @@
         </init-param>
         <init-param>
            <name>scriptUrl</name>
-           <value>/alfresco/168s/mywebforms</value>
+           <value>/alfresco/168s/ui/mywebforms</value>
         </init-param>
 
         <supports>
@@ -122,4 +122,8 @@
         </portlet-info>
     </portlet>
     
+    <user-attribute>
+        <name>user.home-info.online.email</name>
+    </user-attribute>
+
 </portlet-app>
diff --git a/source/web/jsp/dashboards/dashlets/doclist-webscript.jsp b/source/web/jsp/dashboards/dashlets/doclist-webscript.jsp
index eb6cfceae8..4e038a04b9 100644
--- a/source/web/jsp/dashboards/dashlets/doclist-webscript.jsp
+++ b/source/web/jsp/dashboards/dashlets/doclist-webscript.jsp
@@ -24,4 +24,4 @@
 --%>
 <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
 
-<r:webScript scriptUrl="/wcs/doclist" />
\ No newline at end of file
+<r:webScript scriptUrl="/wcs/ui/doclist" />
\ No newline at end of file
diff --git a/source/web/jsp/dashboards/dashlets/myspaces-webscript.jsp b/source/web/jsp/dashboards/dashlets/myspaces-webscript.jsp
index 8635630631..cd7870477c 100644
--- a/source/web/jsp/dashboards/dashlets/myspaces-webscript.jsp
+++ b/source/web/jsp/dashboards/dashlets/myspaces-webscript.jsp
@@ -24,4 +24,4 @@
 --%>
 <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
 
-<r:webScript scriptUrl="/wcs/myspaces" />
\ No newline at end of file
+<r:webScript scriptUrl="/wcs/ui/myspaces" />
\ No newline at end of file
diff --git a/source/web/jsp/dashboards/dashlets/mytasks-webscript.jsp b/source/web/jsp/dashboards/dashlets/mytasks-webscript.jsp
index fa04dd1d07..bfe9456463 100644
--- a/source/web/jsp/dashboards/dashlets/mytasks-webscript.jsp
+++ b/source/web/jsp/dashboards/dashlets/mytasks-webscript.jsp
@@ -24,4 +24,4 @@
 --%>
 <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
 
-<r:webScript scriptUrl="/wcs/mytasks" />
\ No newline at end of file
+<r:webScript scriptUrl="/wcs/ui/mytasks" />
\ No newline at end of file
diff --git a/source/web/jsp/dashboards/dashlets/mywebforms-webscript.jsp b/source/web/jsp/dashboards/dashlets/mywebforms-webscript.jsp
index 3e0d071bf6..97186c798f 100644
--- a/source/web/jsp/dashboards/dashlets/mywebforms-webscript.jsp
+++ b/source/web/jsp/dashboards/dashlets/mywebforms-webscript.jsp
@@ -24,4 +24,4 @@
 --%>
 <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
 
-<r:webScript scriptUrl="/wcs/mywebforms" />
\ No newline at end of file
+<r:webScript scriptUrl="/wcs/ui/mywebforms" />
\ No newline at end of file
diff --git a/source/web/scripts/ajax/doclist.js b/source/web/scripts/ajax/doclist.js
index 823c578dcc..169d1c2df1 100644
--- a/source/web/scripts/ajax/doclist.js
+++ b/source/web/scripts/ajax/doclist.js
@@ -22,7 +22,7 @@ var MyDocs = {
          // is responsible for rendering just the contents of the main panel div
          YAHOO.util.Connect.asyncRequest(
             "GET",
-            MyDocs.ServiceContext + '/doclistpanel?f='+MyDocs.Filter+'&h='+MyDocs.Home+'&q='+MyDocs.Query,
+            MyDocs.ServiceContext + '/ui/doclistpanel?f='+MyDocs.Filter+'&h='+MyDocs.Home+'&q='+MyDocs.Query,
             {
                success: function(response)
                {
diff --git a/source/web/scripts/ajax/myspaces.js b/source/web/scripts/ajax/myspaces.js
index 5e45557d06..5e4c82452b 100644
--- a/source/web/scripts/ajax/myspaces.js
+++ b/source/web/scripts/ajax/myspaces.js
@@ -26,7 +26,7 @@ var MySpaces = {
          // is responsible for rendering just the contents of the main panel div
          YAHOO.util.Connect.asyncRequest(
             "GET",
-            MySpaces.ServiceContext + '/myspacespanel?p='+MySpaces.Path+'&f='+MySpaces.Filter+'&h='+MySpaces.Home,
+            MySpaces.ServiceContext + '/ui/myspacespanel?p='+MySpaces.Path+'&f='+MySpaces.Filter+'&h='+MySpaces.Home,
             {
                success: function(response)
                {
diff --git a/source/web/scripts/ajax/mytasks.js b/source/web/scripts/ajax/mytasks.js
index c2f2497da5..f3617389f4 100644
--- a/source/web/scripts/ajax/mytasks.js
+++ b/source/web/scripts/ajax/mytasks.js
@@ -12,7 +12,7 @@ var MyTasks = {
          // is responsible for rendering just the contents of the main panel div
          YAHOO.util.Connect.asyncRequest(
             "GET",
-            MyTasks.ServiceContext + '/mytaskspanel?f='+MyTasks.Filter,
+            MyTasks.ServiceContext + '/ui/mytaskspanel?f='+MyTasks.Filter,
             {
                success: function(response)
                {