diff --git a/config/alfresco/web-client-config.xml b/config/alfresco/web-client-config.xml
index a3c3146465..9bb3cca58b 100644
--- a/config/alfresco/web-client-config.xml
+++ b/config/alfresco/web-client-config.xml
@@ -190,6 +190,11 @@
             <dashlet id="getting-started" label-id="dashlet_gettingstarted_label"
                   description-id="dashlet_gettingstarted_desc"
                   jsp="/jsp/dashboards/dashlets/getting-started.jsp" allow-narrow="false" />
+            <!-- this dashlet 'tasks-todo' is also shown by default for all users -->
+            <dashlet id="tasks-todo" label-id="my_tasks_todo_title" description-id="my_tasks_todo_desc"
+                  jsp="/jsp/workflow/tasks-todo-dashlet.jsp" allow-narrow="false" />
+            <dashlet id="tasks-completed" label-id="my_tasks_completed_title" description-id="my_tasks_completed_desc"
+                  jsp="/jsp/workflow/tasks-completed-dashlet.jsp" allow-narrow="false" />
             <dashlet id="my-docs-template" label-id="dashlet_mydocuments"
                   description-id="dashlet_mydocuments_desc"
                   jsp="/jsp/dashboards/dashlets/my-docs.jsp" allow-narrow="true" />
@@ -199,10 +204,6 @@
             <dashlet id="my-images" label-id="dashlet_myimages"
                   description-id="dashlet_myimages_desc"
                   jsp="/jsp/dashboards/dashlets/my-images.jsp" allow-narrow="false" />
-            <dashlet id="tasks-todo" label-id="my_tasks_todo_title" description-id="my_tasks_todo_desc"
-                  jsp="/jsp/workflow/tasks-todo-dashlet.jsp" allow-narrow="false" />
-            <dashlet id="tasks-completed" label-id="my_tasks_completed_title" description-id="my_tasks_completed_desc"
-                  jsp="/jsp/workflow/tasks-completed-dashlet.jsp" allow-narrow="false" />
          </dashlets>
          <!-- set true allow the Guest user to configure the dashboard view - false by default -->
          <allow-guest-config>false</allow-guest-config>
diff --git a/source/java/org/alfresco/web/bean/dashboard/DashboardManager.java b/source/java/org/alfresco/web/bean/dashboard/DashboardManager.java
index bea7e5f967..29e9f1de4b 100644
--- a/source/java/org/alfresco/web/bean/dashboard/DashboardManager.java
+++ b/source/java/org/alfresco/web/bean/dashboard/DashboardManager.java
@@ -42,8 +42,9 @@ public class DashboardManager
    private static Log logger = LogFactory.getLog(DashboardManager.class);
    
    private static final String PREF_DASHBOARD = "dashboard";
-   static final String LAYOUT_DEFAULT = "default";
-   static final String DASHLET_DEFAULT = "getting-started";
+   private static final String LAYOUT_DEFAULT = "default";
+   private static final String DASHLET_STARTEDDEFAULT = "getting-started";
+   private static final String DASHLET_TASKSDEFAULT = "tasks-todo";
    
    private static final String JSP_DUMMY = "/jsp/dashboards/dummy.jsp";
    
@@ -150,13 +151,22 @@ public class DashboardManager
             {
                Page page = new Page("default", layout);
                Column defaultColumn = new Column();
-               DashletDefinition dashlet = config.getDashletDefinition(DASHLET_DEFAULT);
+               
+               // add the default dashlet(s) to the column
+               DashletDefinition dashlet = config.getDashletDefinition(DASHLET_STARTEDDEFAULT);
                if (dashlet != null)
                {
                   defaultColumn.addDashlet(dashlet);
-                  page.addColumn(defaultColumn);
-                  pageConfig.addPage(page);
                }
+               dashlet = config.getDashletDefinition(DASHLET_TASKSDEFAULT);
+               if (dashlet != null)
+               {
+                  defaultColumn.addDashlet(dashlet);
+               }
+               
+               // add the column to the page and we are done
+               page.addColumn(defaultColumn);
+               pageConfig.addPage(page);
             }
          }