diff --git a/omod/src/main/java/org/openmrs/module/adminui/page/controller/myaccount/ChangePasswordPageController.java b/omod/src/main/java/org/openmrs/module/adminui/page/controller/myaccount/ChangePasswordPageController.java
index ae6a2b5d..2b431ebb 100644
--- a/omod/src/main/java/org/openmrs/module/adminui/page/controller/myaccount/ChangePasswordPageController.java
+++ b/omod/src/main/java/org/openmrs/module/adminui/page/controller/myaccount/ChangePasswordPageController.java
@@ -29,6 +29,7 @@
 import org.openmrs.ui.framework.page.PageModel;
 import org.openmrs.util.OpenmrsConstants;
 import org.openmrs.util.OpenmrsUtil;
+import org.openmrs.web.user.CurrentUsers;
 import org.openmrs.web.user.UserProperties;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -111,11 +112,11 @@ public String post(PageModel model, @SpringBean("userService") UserService userS
 					nextPage = "myaccount/myAccount";
 				}
 				
-				InfoErrorMessageUtil
-				        .flashInfoMessage(request.getSession(), mss.getMessage("adminui.changePassword.success"));
-				
 				Context.refreshAuthenticatedUser();
+				CurrentUsers.removeUser(request.getSession());
 				
+				InfoErrorMessageUtil
+						.flashInfoMessage(request.getSession(), mss.getMessage("adminui.changePassword.success"));
 				return nextPage;
 			}
 			catch (PasswordException e) {