diff --git a/source/java/org/alfresco/web/bean/actions/BaseActionWizard.java b/source/java/org/alfresco/web/bean/actions/BaseActionWizard.java
index 245d6772f9..8814cb6411 100644
--- a/source/java/org/alfresco/web/bean/actions/BaseActionWizard.java
+++ b/source/java/org/alfresco/web/bean/actions/BaseActionWizard.java
@@ -499,6 +499,12 @@ public abstract class BaseActionWizard extends BaseWizardBean
                      label = mimeTypes.get(id);
                   }
                   
+                  // if there is still no label use the raw mimetype
+                  if (label == null)
+                  {
+                      label = id;
+                  }
+                  
                   this.transformers.add(new SelectItem(id, label));
                }
                
@@ -551,6 +557,12 @@ public abstract class BaseActionWizard extends BaseWizardBean
                   {
                      label = mimeTypes.get(id);
                   }
+                  
+                  // if there is still no label use the raw mimetype
+                  if (label == null)
+                  {
+                      label = id;
+                  }
 
                   this.imageTransformers.add(new SelectItem(id, label));
                }
diff --git a/source/web/WEB-INF/wcm.tld b/source/web/WEB-INF/wcm.tld
index a5ebc432f4..b9078af20d 100644
--- a/source/web/WEB-INF/wcm.tld
+++ b/source/web/WEB-INF/wcm.tld
@@ -355,8 +355,8 @@
    <tag>
       <name>linkValidationProgress</name>
       <tag-class>org.alfresco.web.ui.wcm.tag.LinkValidationProgressTag</tag-class>
-      <display-name>Link Validation Progress</display-name>
       <body-content>JSP</body-content>
+      <display-name>Link Validation Progress</display-name>
       <description>Monitors the progress of the current link validation check being executed.</description>
       
       <attribute>
diff --git a/source/web/jsp/groups/new-group.jsp b/source/web/jsp/groups/new-group.jsp
index 7dc9d59ad1..63ef00c722 100644
--- a/source/web/jsp/groups/new-group.jsp
+++ b/source/web/jsp/groups/new-group.jsp
@@ -58,7 +58,7 @@
       {
          finishButtonPressed = false;
 
-         var message = (window.gecko) ? $("dialog:dialog-body:validation_invalid_character").textContent : $("dialog:dialog-body:validation_invalid_character").innerText;
+         var message = $("dialog:dialog-body:validation_invalid_character").textContent ? $("dialog:dialog-body:validation_invalid_character").textContent : $("dialog:dialog-body:validation_invalid_character").innerText;
          return validateName(document.getElementById("dialog:dialog-body:name"),
                message,
                true);
diff --git a/source/web/jsp/login.jsp b/source/web/jsp/login.jsp
index 89227df403..8d6314b1fc 100644
--- a/source/web/jsp/login.jsp
+++ b/source/web/jsp/login.jsp
@@ -79,16 +79,18 @@
    	session.setAttribute(LoginBean.LOGIN_NOPERMISSIONS, null);
    }
 %>
-   
+
    <%-- load a bundle of properties I18N strings here --%>
    <r:loadBundle var="msg"/>
-   
+
+   <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/validation.js"> </script>
+
    <h:form acceptcharset="UTF-8" id="loginForm" >
-   
+
    <table width=100% height=98% align=center>
       <tr width=100% align=center>
          <td valign=middle align=center width=100%>
-            
+
             <table cellspacing=0 cellpadding=0 border=0>
             <tr><td width=7><img src='<%=request.getContextPath()%>/images/parts/white_01.gif' width=7 height=7 alt=''></td>
             <td background='<%=request.getContextPath()%>/images/parts/white_02.gif'>
@@ -97,30 +99,30 @@
             </tr>
             <tr><td background='<%=request.getContextPath()%>/images/parts/white_04.gif'>
             <img src='<%=request.getContextPath()%>/images/parts/white_04.gif' width=7 height=7 alt=''></td><td bgcolor='white'>
-            
+
             <table border=0 cellspacing=4 cellpadding=2>
                <tr>
                   <td colspan=2>
                      <img src='<%=request.getContextPath()%>/images/logo/AlfrescoLogo200.png' width=200 height=58 alt="Alfresco" title="Alfresco">
                   </td>
                </tr>
-               
+
                <tr>
                   <td colspan=2>
                      <span class='mainSubTitle'><h:outputText value="#{msg.login_details}" />:</span>
                   </td>
                </tr>
-               
+
                <tr>
                   <td>
                      <h:outputText value="#{msg.username}"/>:
                   </td>
                   <td>
                      <%-- input text field, with an example of a nested validator tag --%>
-                     <h:inputText id="user-name" value="#{LoginBean.username}" validator="#{LoginBean.validateUsername}" style="width:150px" />
+                     <h:inputText id="user-name" value="#{LoginBean.username}" validator="#{LoginBean.validateUsername}" onkeyup="updateButtonState();" onchange="updateButtonState();" style="width:150px" />
                   </td>
                </tr>
-               
+
                <tr>
                   <td>
                      <h:outputText value="#{msg.password}"/>:
@@ -131,7 +133,7 @@
                      <h:inputSecret id="user-password" value="#{LoginBean.password}" validator="#{LoginBean.validatePassword}" style="width:150px" />
                   </td>
                </tr>
-               
+
                <tr>
                   <td>
                      <h:outputText value="#{msg.language}:" rendered="#{LoginBean.languageSelect}" />
@@ -143,13 +145,13 @@
                      </h:selectOneMenu>
                   </td>
                </tr>
-               
+
                <tr>
                   <td colspan=2 align=right>
                      <h:commandButton id="submit" action="#{LoginBean.login}" value="#{msg.login}" />
                   </td>
                </tr>
-               
+
                <tr>
                   <td colspan=2>
                      <%-- messages tag to show messages not handled by other specific message tags --%>
@@ -157,7 +159,7 @@
                   </td>
                </tr>
             </table>
-            
+
             </td><td background='<%=request.getContextPath()%>/images/parts/white_06.gif'>
             <img src='<%=request.getContextPath()%>/images/parts/white_06.gif' width=7 height=7 alt=''></td></tr>
             <tr><td width=7><img src='<%=request.getContextPath()%>/images/parts/white_07.gif' width=7 height=7 alt=''></td>
@@ -165,7 +167,7 @@
             <img src='<%=request.getContextPath()%>/images/parts/white_08.gif' width=7 height=7 alt=''></td>
             <td width=7><img src='<%=request.getContextPath()%>/images/parts/white_09.gif' width=7 height=7 alt=''></td></tr>
             </table>
-            
+
             <div id="no-cookies" style="display:none">
                <table cellpadding="0" cellspacing="0" border="0" style="padding-top:16px;">
                   <tr>
@@ -192,25 +194,37 @@
                   document.getElementById("no-cookies").style.display = 'inline';
                }
             </script>
-            
+
          </td>
       </tr>
-      
+
    </table>
-      
+
    </h:form>
 </f:view>
 
 <script>
 
-   if (document.getElementById("loginForm:user-name").value.length == 0)
-   {
-      document.getElementById("loginForm:user-name").focus();
-   }
-   else
-   {
-      document.getElementById("loginForm:user-password").focus();
-   }
+    function validate()
+    {
+        return validateName(document.getElementById("loginForm:user-name"), null, false);
+    }
+
+    function updateButtonState()
+    {
+      document.getElementById("loginForm:submit").disabled = !validate();
+    }
+
+    document.getElementById("loginForm").onsubmit = validate;
+    if (document.getElementById("loginForm:user-name").value.length == 0)
+    {
+       document.getElementById("loginForm:user-name").focus();
+    }
+    else
+    {
+       document.getElementById("loginForm:user-password").focus();
+    }
+    updateButtonState();
 
 </script>
 
diff --git a/source/web/jsp/users/new-user-wizard/new-user-properties.jsp b/source/web/jsp/users/new-user-wizard/new-user-properties.jsp
index d8621504b9..11e8fb1035 100644
--- a/source/web/jsp/users/new-user-wizard/new-user-properties.jsp
+++ b/source/web/jsp/users/new-user-wizard/new-user-properties.jsp
@@ -77,7 +77,7 @@ function validate()
    {
       finishButtonPressed = false;
 
-      var message = (window.gecko) ? $("wizard:wizard-body:validation_invalid_character").textContent : $("wizard:wizard-body:validation_invalid_character").innerText;
+      var message = $("wizard:wizard-body:validation_invalid_character").textContent ? $("wizard:wizard-body:validation_invalid_character").textContent : $("wizard:wizard-body:validation_invalid_character").innerText;
       return validateName(document.getElementById("wizard:wizard-body:userName"),
             message,
             true);
diff --git a/source/web/jsp/wcm/create-website-wizard/details.jsp b/source/web/jsp/wcm/create-website-wizard/details.jsp
index db18812da0..fd3e0a23cd 100644
--- a/source/web/jsp/wcm/create-website-wizard/details.jsp
+++ b/source/web/jsp/wcm/create-website-wizard/details.jsp
@@ -60,13 +60,13 @@
       if (finishButtonPressed)
       {
          finishButtonPressed = false;
-         var message = (window.gecko) ? $("wizard:wizard-body:validation_invalid_character").textContent : $("wizard:wizard-body:validation_invalid_character").innerText;
+         var message = $("wizard:wizard-body:validation_invalid_character").textContent ? $("wizard:wizard-body:validation_invalid_character").textContent : $("wizard:wizard-body:validation_invalid_character").innerText;
          var valid = validateName(document.getElementById("wizard:wizard-body:name"), 
                              message,
                              true);
          if (valid == true)
          {
-            message = (window.gecko) ? $("wizard:wizard-body:validation_invalid_dns_name").textContent : $("wizard:wizard-body:validation_invalid_dns_name").innerText;
+            message = $("wizard:wizard-body:validation_invalid_dns_name").textContent ? $("wizard:wizard-body:validation_invalid_dns_name").textContent : $("wizard:wizard-body:validation_invalid_dns_name").innerText;
             valid = validateRegex(document.getElementById("wizard:wizard-body:dnsname"),
                   "^[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?$", true, null,
                   message, true);
diff --git a/source/web/scripts/validation.js b/source/web/scripts/validation.js
index 197e2da75e..947ed655ff 100644
--- a/source/web/scripts/validation.js
+++ b/source/web/scripts/validation.js
@@ -175,7 +175,7 @@ function validateDialog()
    if (finishButtonPressed)
    {
       finishButtonPressed = false;
-      var message = (window.gecko) ? $("dialog:dialog-body:validation_invalid_character").textContent : $("dialog:dialog-body:validation_invalid_character").innerText;
+      var message = $("dialog:dialog-body:validation_invalid_character").textContent ? $("dialog:dialog-body:validation_invalid_character").textContent : $("dialog:dialog-body:validation_invalid_character").innerText;
       return validateName($("dialog:dialog-body:name"), message, true);
    }
    else
@@ -189,7 +189,7 @@ function validateWizard()
    if (finishButtonPressed)
    {
       finishButtonPressed = false;
-      var message = (window.gecko) ? $("wizard:wizard-body:validation_invalid_character").textContent : $("wizard:wizard-body:validation_invalid_character").innerText;
+      var message = $("wizard:wizard-body:validation_invalid_character").textContent ? $("wizard:wizard-body:validation_invalid_character").textContent : $("wizard:wizard-body:validation_invalid_character").innerText;
       return validateName($("wizard:wizard-body:name"), message, true);
    }
    else