Index: lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveController.java
===================================================================
diff -u -r3ec6f7db6edbcd0d8a9e9ba89952ffe39df68eb5 -r88b8e837ea5c4e4a87cb26087c5c8aaf4c225d97
--- lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveController.java	(.../ProfileSaveController.java)	(revision 3ec6f7db6edbcd0d8a9e9ba89952ffe39df68eb5)
+++ lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveController.java	(.../ProfileSaveController.java)	(revision 88b8e837ea5c4e4a87cb26087c5c8aaf4c225d97)
@@ -63,14 +63,15 @@
 
     @RequestMapping(path = "/saveprofile")
     public String execute(@ModelAttribute("newForm") UserForm userForm, HttpServletRequest request) throws Exception {
-
 	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
 
 	if (!Configuration.getAsBoolean(ConfigurationKeys.PROFILE_EDIT_ENABLE)) {
 	    if (!Configuration.getAsBoolean(ConfigurationKeys.PROFILE_PARTIAL_EDIT_ENABLE)) {
 		return "forward:/profile/edit.do";
 	    }
 	}
+	
+	request.setAttribute("submitted", true);
 
 	User requestor = service.getUserByLogin(request.getRemoteUser());
 
@@ -116,8 +117,7 @@
 
 	if (!errorMap.isEmpty()) {
 	    request.setAttribute("errorMap", errorMap);
-	    request.setAttribute("bbb", "OK!");
-	    return "profile/editprofile";
+	    return "forward:/profile/edit.do";
 	}
 
 	if (!Configuration.getAsBoolean(ConfigurationKeys.PROFILE_EDIT_ENABLE)
Index: lams_central/web/profile/editprofile.jsp
===================================================================
diff -u -r75204c057bac36bbf938738fad5427650d997209 -r88b8e837ea5c4e4a87cb26087c5c8aaf4c225d97
--- lams_central/web/profile/editprofile.jsp	(.../editprofile.jsp)	(revision 75204c057bac36bbf938738fad5427650d997209)
+++ lams_central/web/profile/editprofile.jsp	(.../editprofile.jsp)	(revision 88b8e837ea5c4e4a87cb26087c5c8aaf4c225d97)
@@ -22,25 +22,11 @@
 	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/profile.js"></script>
 	<script type="text/javascript">
-		function submitMessage() {
-			var formData = new FormData(document.getElementById("newForm"));
-
-			$.ajax({ // create an AJAX call...
-				data : formData,
-				processData : false, // tell jQuery not to process the data
-				contentType : false, // tell jQuery not to set contentType
-				type : $("#newForm").attr('method'),
-				url : $("#newForm").attr('action'),
-				success : function(data) {
-					if ( data.indexOf('profileRestrictions') > 0)
-						$("html").html(data);
-					else
-						window.parent.location.reload();
-				}
-			});
-		}
-		
 		$(document).ready( function() {
+			if ('${submitted}' == true && $('#error').length == 0) {
+				window.parent.location.reload();
+			} 
+			
 			//update dialog's height and title
 			updateMyProfileDialogSettings(
 				'<fmt:message key="title.profile.edit.screen" />',
@@ -366,18 +352,18 @@
 					</div>
 				</div>
 			</div>
-	</form:form>
-	<div class="form-group" align="right">
-		<button type="button" class="btn btn-sm btn-default voffset5" onclick="history.go(-1);">
-			<fmt:message key="button.cancel" />
-		</button>
-		&nbsp;&nbsp;
-		<c:if test="${profileEditEnabled or partialProfileEditEnabled}">
-			<button type="button" class="btn btn-sm btn-primary voffset5" 
-					name="submit" onclick="submitMessage()"> 
-				<fmt:message key="button.save" />
+		<div class="form-group" align="right">
+			<button type="button" class="btn btn-sm btn-default voffset5" onclick="history.go(-1);">
+				<fmt:message key="button.cancel" />
 			</button>
-		</c:if>
-	</div>
+			&nbsp;&nbsp;
+			<c:if test="${profileEditEnabled or partialProfileEditEnabled}">
+				<button type="submit" class="btn btn-sm btn-primary voffset5" 
+						name="submit"> 
+					<fmt:message key="button.save" />
+				</button>
+			</c:if>
+		</div>
+	</form:form>
 </body>
 </lams:html>
\ No newline at end of file