Index: lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeController.java
===================================================================
diff -u -ra127989b08183726fcbb9956721eff6553c4a0eb -r71809a5526cd51317de36a6aeb03235579a446a5
--- lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeController.java	(.../PasswordChangeController.java)	(revision a127989b08183726fcbb9956721eff6553c4a0eb)
+++ lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeController.java	(.../PasswordChangeController.java)	(revision 71809a5526cd51317de36a6aeb03235579a446a5)
@@ -143,9 +143,7 @@
 	// -- Report any errors
 	if (!errorMap.isEmpty()) {
 	    request.setAttribute("errorMap", errorMap);
-	    passwordChangeForm.reset(request);
-	    request.setAttribute("redirect", "password");
-	    return "redirect:/index.do";
+	    return "passwordChangeContent";
 	}
 	request.setAttribute("redirectURL", passwordChangeForm.getRedirectURL());
 	return "/passwordChangeOkContent";
Index: lams_central/web/WEB-INF/tags/Errors.tag
===================================================================
diff -u
--- lams_central/web/WEB-INF/tags/Errors.tag	(revision 0)
+++ lams_central/web/WEB-INF/tags/Errors.tag	(revision 71809a5526cd51317de36a6aeb03235579a446a5)
@@ -0,0 +1,47 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ attribute name="showAll" required="false" rtexprvalue="true"%>
+<%@ attribute name="errorKey" required="false" rtexprvalue="true"%>
+
+<%-- To show the GLOBAL messages (default case) use no parameters --%>
+<%-- To show the all messages, ignoring their keys (e.g. Change Password) use showAll="true" --%>
+<%-- To show the messages for a particular key use errorKey="theKey" --%>
+
+<%-- Show All Messages --%>
+<c:choose>
+<c:when test="${showAll}">
+	<c:if test="${not empty errorMap}"> 
+   	<lams:Alert id="error" type="danger" close="false"> 
+       <c:forEach var="error" items="${errorMap}"> 
+       <c:forEach var="erorString" items="${error.value}"> 
+       	<c:out value="${erorString}" /><br /> 
+       </c:forEach> 
+       </c:forEach> 
+	</lams:Alert> 
+	</c:if>
+</c:when>
+
+<%-- Show messages for a particular key --%>
+<c:when test="${not empty errorKey}">
+	<c:if test="${not empty errorMap and not empty errorMap[errorKey]}">
+		<span class="text-danger">
+		<c:forEach var="error" items="${errorMap[errorKey]}"> 
+	       	<c:out value="${error}" /><br /> 
+        </c:forEach> 
+        </span>
+    </c:if>
+</c:when>
+
+<%-- Show Messages for GLOBAL. Usual alert box --%>
+<c:otherwise>
+   	<c:set var="errorKeyisGlobal" value="GLOBAL" />
+	<c:if test="${not empty errorMap and not empty errorMap[errorKeyisGlobal]}"> 
+   	<lams:Alert id="error" type="danger" close="false"> 
+       <c:forEach var="error" items="${errorMap[errorKeyisGlobal]}"> 
+       	<c:out value="${error}" /><br /> 
+       </c:forEach> 
+	</lams:Alert> 
+	</c:if>
+</c:otherwise>
+</c:choose>
Index: lams_central/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r4a0345ec36518827a51d1ccc517912f72e5b1ee0 -r71809a5526cd51317de36a6aeb03235579a446a5
--- lams_central/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 4a0345ec36518827a51d1ccc517912f72e5b1ee0)
+++ lams_central/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 71809a5526cd51317de36a6aeb03235579a446a5)
@@ -344,6 +344,10 @@
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
+	<tag-file>
+	    <name>Errors</name>
+		<path>/WEB-INF/tags/Errors.tag</path>
+   	</tag-file>  
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_central/web/emailuser.jsp
===================================================================
diff -u -ra87fc96c97da931cd385ab998a421b5a3d2b4e90 -r71809a5526cd51317de36a6aeb03235579a446a5
--- lams_central/web/emailuser.jsp	(.../emailuser.jsp)	(revision a87fc96c97da931cd385ab998a421b5a3d2b4e90)
+++ lams_central/web/emailuser.jsp	(.../emailuser.jsp)	(revision 71809a5526cd51317de36a6aeb03235579a446a5)
@@ -91,14 +91,7 @@
 			<div class="panel-heading">
 				<fmt:message key="email.compose.mail" />
 			</div>
-			 <c:set var="errorKey" value="GLOBAL" /> 
-			 <c:if test="${not empty errorMap and not empty errorMap[errorKey]}"> 
-			    <lams:Alert id="errorArea" type="warning">
-			         <c:forEach var="error" items="${errorMap[errorKey]}"> 
-			             <c:out value="${error}" /><br /> 
-			         </c:forEach> 
-			     </lams:Alert> 
-			</c:if>
+			<lams:Errors/>	
 			<div class="panel-body">
 				<form id="emailUserForm"
 					action="<lams:LAMSURL/>emailUser/send.do" method="post">
Index: lams_central/web/indexLessonConditions.jsp
===================================================================
diff -u -rb7aef118db71bf93f74bf91c76fbd4e59de37dff -r71809a5526cd51317de36a6aeb03235579a446a5
--- lams_central/web/indexLessonConditions.jsp	(.../indexLessonConditions.jsp)	(revision b7aef118db71bf93f74bf91c76fbd4e59de37dff)
+++ lams_central/web/indexLessonConditions.jsp	(.../indexLessonConditions.jsp)	(revision 71809a5526cd51317de36a6aeb03235579a446a5)
@@ -46,14 +46,7 @@
     
 <body class="stripes">
 <lams:Page type="admin" title="">
- <c:set var="errorKey" value="GLOBAL" /> 
- <c:if test="${not empty errorMap and not empty errorMap[errorKey]}"> 
-     <lams:Alert id="error" type="danger" close="false"> 
-         <c:forEach var="error" items="${errorMap[errorKey]}"> 
-             <c:out value="${error}" /><br /> 
-         </c:forEach> 
-     </lams:Alert> 
-</c:if>
+	<lams:Errors/>	
 
 	<!-- Preceding lessons setup -->
 		<p class="lead">
Index: lams_central/web/outcome/outcomeEdit.jsp
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r71809a5526cd51317de36a6aeb03235579a446a5
--- lams_central/web/outcome/outcomeEdit.jsp	(.../outcomeEdit.jsp)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_central/web/outcome/outcomeEdit.jsp	(.../outcomeEdit.jsp)	(revision 71809a5526cd51317de36a6aeb03235579a446a5)
@@ -61,15 +61,8 @@
 				class="col-xs-12 col-sm-8 col-sm-offset-2 col-md-6 col-md-offset-3">
 				<div class="panel">
 					<div class="panel-body">
-						<%-- Error Messages --%>
-						 <c:set var="errorKey" value="GLOBAL" />
-						 <c:if test="${not empty errorMap and not empty errorMap[errorKey]}">
-						     <lams:Alert id="error" type="danger" close="false">
-						         <c:forEach var="error" items="${errorMap[errorKey]}">
-						             <c:out value="${error}" />
-						         </c:forEach>
-						     </lams:Alert>
-						 </c:if>
+					
+						<lams:Errors/>
 						
 						<div class="form-group">
 							<label><fmt:message key="outcome.manage.add.name" />:
Index: lams_central/web/outcome/scaleEdit.jsp
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r71809a5526cd51317de36a6aeb03235579a446a5
--- lams_central/web/outcome/scaleEdit.jsp	(.../scaleEdit.jsp)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_central/web/outcome/scaleEdit.jsp	(.../scaleEdit.jsp)	(revision 71809a5526cd51317de36a6aeb03235579a446a5)
@@ -47,15 +47,8 @@
 				class="col-xs-12 col-sm-8 col-sm-offset-2 col-md-6 col-md-offset-3">
 				<div class="panel">
 					<div class="panel-body">
-						<%-- Error Messages --%>
-						 <c:set var="errorKey" value="GLOBAL" />
-						 <c:if test="${not empty errorMap and not empty errorMap[errorKey]}">
-						     <lams:Alert id="error" type="danger" close="false">
-						         <c:forEach var="error" items="${errorMap[errorKey]}">
-						             <c:out value="${error}" />
-						         </c:forEach>
-						     </lams:Alert>
-						 </c:if>
+					
+						<lams:Errors/>
 						
 						<div class="form-group">
 							<label><fmt:message key="outcome.manage.add.name" />:
Index: lams_central/web/outcome/scaleManage.jsp
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r71809a5526cd51317de36a6aeb03235579a446a5
--- lams_central/web/outcome/scaleManage.jsp	(.../scaleManage.jsp)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_central/web/outcome/scaleManage.jsp	(.../scaleManage.jsp)	(revision 71809a5526cd51317de36a6aeb03235579a446a5)
@@ -34,15 +34,9 @@
 </lams:head>
 <body class="stripes">
 <lams:Page type="admin" >
-	 <c:set var="errorKey" value="GLOBAL" />
-	 <c:if test="${not empty errorMap and not empty errorMap[errorKey]}">
-	     <lams:Alert id="error" type="danger" close="false">
-	         <c:forEach var="error" items="${errorMap[errorKey]}">
-	             <c:out value="${error}" />
-	         </c:forEach>
-	     </lams:Alert>
-	 </c:if>
-	
+
+	<lams:Errors/>	
+
 	<div class="outcomeContainer">
 		<div class="row">
 			<div class="col-xs-5">
Index: lams_central/web/passwordChangeContent.jsp
===================================================================
diff -u -r88c8fa0dba475bf3ffa351ec1e6d889481e4dcbb -r71809a5526cd51317de36a6aeb03235579a446a5
--- lams_central/web/passwordChangeContent.jsp	(.../passwordChangeContent.jsp)	(revision 88c8fa0dba475bf3ffa351ec1e6d889481e4dcbb)
+++ lams_central/web/passwordChangeContent.jsp	(.../passwordChangeContent.jsp)	(revision 71809a5526cd51317de36a6aeb03235579a446a5)
@@ -101,39 +101,15 @@
 		<div class="row vertical-center-row">
 			<div class="col-xs-12 col-sm-8 col-sm-offset-2 col-md-6 col-md-offset-3">
 				<div class="panel voffset20">
-						 <c:set var="errorKey" value="GLOBAL" /> 
-						 <c:if test="${not empty errorMap and not empty errorMap[errorKey]}"> 
-						 	<p class="warning">
-							         <c:forEach var="error" items="${errorMap[errorKey]}"> 
-							             <c:out value="${error}" /><br /> 
-							         </c:forEach> 
-						     </p>
-						</c:if>
-						<c:set var="errorKey" value="password" /> 
-						 <c:if test="${not empty errorMap and not empty errorMap[errorKey]}"> 
-						 	<p class="warning">
-							         <c:forEach var="error" items="${errorMap[errorKey]}"> 
-							             <c:out value="${error}" /><br /> 
-							         </c:forEach> 
-						     </p>
-						</c:if>
-						<c:set var="errorKey" value="oldPassword" /> 
-						 <c:if test="${not empty errorMap and not empty errorMap[errorKey]}"> 
-						 	<p class="warning">
-							         <c:forEach var="error" items="${errorMap[errorKey]}"> 
-							             <c:out value="${error}" /><br /> 
-							         </c:forEach> 
-						     </p>
-						</c:if>
-						
-
+					<lams:Errors/>
 					<div class="panel-body">
 					<input type="hidden" name="redirectURL" value="${param.redirectURL}" />
 							<form:hidden name="<%=PasswordChangeActionForm.formName%>"
 								path="login" />
 							<div class="form-group">
 								<label for="oldPassword"><fmt:message key="label.password.old.password" />:</label>
-								<input class="form-control" type="password" maxlength="50" placeholder="<fmt:message key="label.password.old.password" />" name="oldPassword" id="oldPassword"/>			
+ 								<lams:Errors errorKey="oldPassword"/>	
+ 								<input class="form-control" type="password" maxlength="50" placeholder="<fmt:message key="label.password.old.password" />" name="oldPassword" id="oldPassword"/>			
 							</div>
 							
 							<div class="col-xs-12">
@@ -157,8 +133,8 @@
 								 </lams:Alert> 
 							</div>
 							
-
-							<div class="input-group voffset5">
+							<lams:Errors errorKey="password"/>	
+ 							<div class="input-group voffset5">
 								<span class="input-group-addon"><i class="fa fa-lock"></i></span>
 								<input class="form-control" type="password"  
 									placeholder="<fmt:message key='label.password.new.password' />" id="password" name="password" maxlength="25"/> 			
Index: lams_central/web/profile/editprofile.jsp
===================================================================
diff -u -r631c7dc064ad1df75c61609936bca046eea36e4a -r71809a5526cd51317de36a6aeb03235579a446a5
--- lams_central/web/profile/editprofile.jsp	(.../editprofile.jsp)	(revision 631c7dc064ad1df75c61609936bca046eea36e4a)
+++ lams_central/web/profile/editprofile.jsp	(.../editprofile.jsp)	(revision 71809a5526cd51317de36a6aeb03235579a446a5)
@@ -56,14 +56,7 @@
 		<form:hidden path="login" />
 		<form:hidden path="password" />
 
-		 <c:set var="errorKey" value="GLOBAL" /> 
-		 <c:if test="${not empty errorMap and not empty errorMap[errorKey]}"> 
-		     <lams:Alert id="error" type="danger" close="false"> 
-		         <c:forEach var="error" items="${errorMap[errorKey]}"> 
-		             <c:out value="${error}" /><br /> 
-		         </c:forEach> 
-		     </lams:Alert> 
-		</c:if>
+		<lams:Errors/>
 
 		<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>
Index: lams_central/web/questions/questionFile.jsp
===================================================================
diff -u -r5943e05705f7614c7c1c29d13ce50deacdc46cc0 -r71809a5526cd51317de36a6aeb03235579a446a5
--- lams_central/web/questions/questionFile.jsp	(.../questionFile.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
+++ lams_central/web/questions/questionFile.jsp	(.../questionFile.jsp)	(revision 71809a5526cd51317de36a6aeb03235579a446a5)
@@ -58,15 +58,7 @@
 	</c:set>
 	<lams:Page type="admin" title="${title}">
 			
-			 <c:set var="errorKey" value="GLOBAL" /> 
-			 <c:if test="${not empty errorMap and not empty errorMap[errorKey]}"> 
-			     <lams:Alert id="error" type="danger" close="false"> 
-			         <c:forEach var="error" items="${errorMap[errorKey]}"> 
-			             <c:out value="${error}" /><br /> 
-			         </c:forEach> 
-			     </lams:Alert> 
-			</c:if>
-			
+		<lams:Errors/>				
 
 			<form id="questionForm" action="<lams:LAMSURL/>questions.do" enctype="multipart/form-data" method="post" onsubmit="return verifyAndSubmit();">
 				<input type="hidden" name="returnURL" value="${empty param.returnURL ? returnURL : param.returnURL}" />