Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexController.java
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r3ec6f7db6edbcd0d8a9e9ba89952ffe39df68eb5
--- lams_central/src/java/org/lamsfoundation/lams/web/IndexController.java	(.../IndexController.java)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_central/src/java/org/lamsfoundation/lams/web/IndexController.java	(.../IndexController.java)	(revision 3ec6f7db6edbcd0d8a9e9ba89952ffe39df68eb5)
@@ -122,7 +122,7 @@
 	if (StringUtils.equals(redirectURL, "profile")) {
 	    return "redirect:/profile/view.do";
 	} else if (StringUtils.equals(redirectURL, "editprofile")) {
-	    return "redirect:/profile/edit.do";
+	    return "forward:/profile/edit.do";
 	} else if (StringUtils.equals(redirectURL, "password")) {
 	    return "redirect:/password.do";
 	} else if (StringUtils.equals(redirectURL, "portrait")) {
Index: lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveController.java
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r3ec6f7db6edbcd0d8a9e9ba89952ffe39df68eb5
--- lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveController.java	(.../ProfileSaveController.java)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveController.java	(.../ProfileSaveController.java)	(revision 3ec6f7db6edbcd0d8a9e9ba89952ffe39df68eb5)
@@ -68,8 +68,7 @@
 
 	if (!Configuration.getAsBoolean(ConfigurationKeys.PROFILE_EDIT_ENABLE)) {
 	    if (!Configuration.getAsBoolean(ConfigurationKeys.PROFILE_PARTIAL_EDIT_ENABLE)) {
-		request.setAttribute("redirect", "editprofile");
-		return "redirect:/index.do";
+		return "forward:/profile/edit.do";
 	    }
 	}
 
@@ -81,8 +80,7 @@
 		    .warn(requestor.getLogin() + " tried to edit profile of user " + userForm.getLogin());
 	    errorMap.add("GLOBAL", messageService.getMessage("error.authorisation"));
 	    request.setAttribute("errorMap", errorMap);
-	    request.setAttribute("redirect", "editprofile");
-	    return "redirect:/index.do";
+	    return "forward:/profile/edit.do";
 	}
 
 	// (dyna)form validation
@@ -118,8 +116,8 @@
 
 	if (!errorMap.isEmpty()) {
 	    request.setAttribute("errorMap", errorMap);
-	    request.setAttribute("redirect", "editprofile");
-	    return "redirect:/index.do";
+	    request.setAttribute("bbb", "OK!");
+	    return "profile/editprofile";
 	}
 
 	if (!Configuration.getAsBoolean(ConfigurationKeys.PROFILE_EDIT_ENABLE)
@@ -146,8 +144,7 @@
 	HttpSession ss = SessionManager.getSession();
 	ss.setAttribute(AttributeNames.USER, requestor.getUserDTO());
 
-	request.setAttribute("redirect", "profile");
-	return "redirect:/index.do";
+	return "forward:/profile/view.do";
     }
 
 }
Index: lams_central/web/profile/editprofile.jsp
===================================================================
diff -u -rae9912edeb82523d71d1e18df67ec5ee7e6301a8 -r3ec6f7db6edbcd0d8a9e9ba89952ffe39df68eb5
--- lams_central/web/profile/editprofile.jsp	(.../editprofile.jsp)	(revision ae9912edeb82523d71d1e18df67ec5ee7e6301a8)
+++ lams_central/web/profile/editprofile.jsp	(.../editprofile.jsp)	(revision 3ec6f7db6edbcd0d8a9e9ba89952ffe39df68eb5)
@@ -56,7 +56,7 @@
 		<form:hidden path="login" />
 		<form:hidden path="password" />
 
-		<lams:errors/>
+		<lams:errors path="*"/>
 
 		<c:set var="profileEditEnabled"><%=Configuration.get(ConfigurationKeys.PROFILE_EDIT_ENABLE)%></c:set>
 		<c:set var="partialProfileEditEnabled"><%=Configuration.get(ConfigurationKeys.PROFILE_PARTIAL_EDIT_ENABLE)%></c:set>
@@ -379,6 +379,5 @@
 			</button>
 		</c:if>
 	</div>
-	</div>
 </body>
 </lams:html>
\ No newline at end of file