Index: lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java,v diff -u -r1.23 -r1.24 --- lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java 1 Oct 2010 20:34:12 -0000 1.23 +++ lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java 30 Dec 2011 08:29:37 -0000 1.24 @@ -35,6 +35,7 @@ import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; +import org.apache.struts.Globals; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; @@ -202,8 +203,13 @@ public ActionForward edit(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception { + + //some errors may have already been set in ProfileSaveAction + ActionMessages errors = (ActionMessages) request.getAttribute(Globals.ERROR_KEY); + if (errors == null) { + errors = new ActionMessages(); + } - ActionMessages errors = new ActionMessages(); if (!Configuration.getAsBoolean(ConfigurationKeys.PROFILE_EDIT_ENABLE)) { if (!Configuration.getAsBoolean(ConfigurationKeys.PROFILE_PARTIAL_EDIT_ENABLE)) { errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.edit.disabled")); Index: lams_central/web/editprofile.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/editprofile.jsp,v diff -u -r1.21 -r1.22 --- lams_central/web/editprofile.jsp 1 Oct 2010 20:34:12 -0000 1.21 +++ lams_central/web/editprofile.jsp 30 Dec 2011 08:29:37 -0000 1.22 @@ -52,6 +52,16 @@