diff --git a/source/java/org/alfresco/web/bean/dashboard/DashboardWizard.java b/source/java/org/alfresco/web/bean/dashboard/DashboardWizard.java
index 3c031cbcfc..1b1bdf49a7 100644
--- a/source/java/org/alfresco/web/bean/dashboard/DashboardWizard.java
+++ b/source/java/org/alfresco/web/bean/dashboard/DashboardWizard.java
@@ -64,7 +64,7 @@ public class DashboardWizard extends BaseWizardBean
     */
    protected String finishImpl(FacesContext context, String outcome) throws Exception
    {
-      return null;
+      return outcome;
    }
    
    /**
diff --git a/source/web/jsp/dashboards/wizard/columns.jsp b/source/web/jsp/dashboards/wizard/columns.jsp
index d8c548e8d4..f609540f4e 100644
--- a/source/web/jsp/dashboards/wizard/columns.jsp
+++ b/source/web/jsp/dashboards/wizard/columns.jsp
@@ -21,3 +21,14 @@
 <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
 
 <%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<f:verbatim>
+   <script type="text/javascript">
+      window.onload = pageLoaded;
+   
+      function pageLoaded()
+      {
+         document.getElementById("wizard:finish-button").disabled = false;
+      }
+   </script>
+</f:verbatim>