diff --git a/source/java/org/alfresco/web/bean/wcm/EditWebsiteWizard.java b/source/java/org/alfresco/web/bean/wcm/EditWebsiteWizard.java
index b5c6c5dea6..7ae18d4a0f 100644
--- a/source/java/org/alfresco/web/bean/wcm/EditWebsiteWizard.java
+++ b/source/java/org/alfresco/web/bean/wcm/EditWebsiteWizard.java
@@ -138,7 +138,10 @@ public class EditWebsiteWizard extends CreateWebsiteWizard
       // persist the forms, templates, workflows, workflow defaults and deployment config
       // to the model for this web project
       saveWebProjectModel(nodeRef);
-      
+
+      // Make sure name and description are refreshed before display
+      this.navigator.resetCurrentNodeProperties();      
+
       return AlfrescoNavigationHandler.CLOSE_WIZARD_OUTCOME;
    }
    
diff --git a/source/web/jsp/wcm/create-website-wizard/details.jsp b/source/web/jsp/wcm/create-website-wizard/details.jsp
index 03f241d4f1..030054a99c 100644
--- a/source/web/jsp/wcm/create-website-wizard/details.jsp
+++ b/source/web/jsp/wcm/create-website-wizard/details.jsp
@@ -48,13 +48,16 @@
    function checkButtonState()
    {
       if (document.getElementById("wizard:wizard-body:name").value.length == 0 ||
-          document.getElementById("wizard:wizard-body:dnsname").value.length < 1)
+          document.getElementById("wizard:wizard-body:dnsname").value.length < 1 ||
+          document.getElementById("wizard:wizard-body:description").value.length > 1000)
       {
          document.getElementById("wizard:next-button").disabled = true;
+         document.getElementById("wizard:finish-button").disabled = true;
       }
       else
       {
          document.getElementById("wizard:next-button").disabled = false;
+         document.getElementById("wizard:finish-button").disabled = false;
       }
    }
    
@@ -171,7 +174,8 @@
       </td>
       <td>
          </f:verbatim>
-         <h:inputTextarea id="description" value="#{WizardManager.bean.description}" rows="3" cols="42" />
+         <h:inputTextarea id="description" value="#{WizardManager.bean.description}" rows="3" cols="42"
+                 onkeyup="javascript:checkButtonState();" />
          <f:verbatim>
       </td>
    </tr>