Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
===================================================================
diff -u -rcd8fbfefd79252fdd29aebb95fb2e369ee6abfa8 -rf290dd48e471facda515082e1436faa2235143f2
--- lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	(.../IndexAction.java)	(revision cd8fbfefd79252fdd29aebb95fb2e369ee6abfa8)
+++ lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	(.../IndexAction.java)	(revision f290dd48e471facda515082e1436faa2235143f2)
@@ -112,9 +112,7 @@
 	    return mapping.findForward("editprofile");
 	} else if (StringUtils.equals(method, "password")) {
 	    return mapping.findForward("password");
-	} else if (StringUtils.equals(method, "passwordChanged")) {
-	    return mapping.findForward("passwordChanged");
-	} else if (StringUtils.equals(method, "portrait")) {
+	}  else if (StringUtils.equals(method, "portrait")) {
 	    return mapping.findForward("portrait");
 	} else if (StringUtils.equals(method, "lessons")) {
 	    return mapping.findForward("lessons");
Index: lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java
===================================================================
diff -u -rc33d82bf97152099b7a309a156ec2707239b622c -rf290dd48e471facda515082e1436faa2235143f2
--- lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java	(.../PasswordChangeAction.java)	(revision c33d82bf97152099b7a309a156ec2707239b622c)
+++ lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java	(.../PasswordChangeAction.java)	(revision f290dd48e471facda515082e1436faa2235143f2)
@@ -142,7 +142,7 @@
 	    // If no input page, use error forwarding
 	    return (mapping.findForward("error.system"));
 	}
-
+	request.setAttribute("redirectURL",passwordChangeForm.getRedirectURL());
 	return mapping.findForward("okay");
 
     }
Index: lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeActionForm.java
===================================================================
diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rf290dd48e471facda515082e1436faa2235143f2
--- lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeActionForm.java	(.../PasswordChangeActionForm.java)	(revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa)
+++ lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeActionForm.java	(.../PasswordChangeActionForm.java)	(revision f290dd48e471facda515082e1436faa2235143f2)
@@ -40,6 +40,8 @@
 public class PasswordChangeActionForm extends ActionForm {
 
     public static final String formName = "PasswordChangeActionForm"; // must match name in @struts:action section above
+    
+    private String redirectURL;
 
     private String oldPassword;
 
@@ -123,7 +125,15 @@
     public void setOldPassword(String oldPassword) {
 	this.oldPassword = StringUtils.trimToEmpty(oldPassword);
     }
+    
+    public String getRedirectURL() {
+        return redirectURL;
+    }
 
+    public void setRedirectURL(String redirectURL) {
+        this.redirectURL = redirectURL;
+    }
+
     /**
      * Reset all properties to their default values.
      *
Index: lams_central/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r353fe07604639c2166ed68fbf832810959f3f3cf -rf290dd48e471facda515082e1436faa2235143f2
--- lams_central/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 353fe07604639c2166ed68fbf832810959f3f3cf)
+++ lams_central/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision f290dd48e471facda515082e1436faa2235143f2)
@@ -150,11 +150,6 @@
         redirect="false"
       />
       <forward
-        name="passwordChanged"
-        path="/passwordChangeOkContent.jsp"
-        redirect="false"
-      />
-      <forward
         name="twoFactorAuthentication"
         path="/twoFactorAuthentication.do"
         redirect="false"
@@ -679,9 +674,9 @@
       unknown="false"
       validate="false"
     >
-      <forward
+    <forward
         name="okay"
-        path="/index.do?state=active&amp;method=passwordChanged"
+        path="/passwordChangeOkContent.jsp"
         redirect="false"
       />
       <forward
Index: lams_central/web/passwordChangeContent.jsp
===================================================================
diff -u -r607eac9284ea4c4cb88f03805d5945fe27277244 -rf290dd48e471facda515082e1436faa2235143f2
--- lams_central/web/passwordChangeContent.jsp	(.../passwordChangeContent.jsp)	(revision 607eac9284ea4c4cb88f03805d5945fe27277244)
+++ lams_central/web/passwordChangeContent.jsp	(.../passwordChangeContent.jsp)	(revision f290dd48e471facda515082e1436faa2235143f2)
@@ -98,9 +98,7 @@
 
 <body>
 <html:form styleId="change-password" action="/passwordChanged" method="post">
-
 	<div style="clear: both"></div>
-
 	<div class="container">
 		<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">
@@ -114,7 +112,7 @@
 						</p>
 					</logic:messagesPresent>
 					<div class="panel-body">
-						<form class="form-horizontal">
+					<input type="hidden" name="redirectURL" value="${param.redirectURL}" />
 							<html:hidden name="<%=PasswordChangeActionForm.formName%>"
 								property="login" />
 							<div class="form-group">
@@ -159,7 +157,6 @@
 								</html:submit>
 
 							</div>
-						</form>
 					</div>
 
 				</div>
Index: lams_central/web/passwordChangeOkContent.jsp
===================================================================
diff -u -r43a81b97418d202b694ee15c30c6069a56370c46 -rf290dd48e471facda515082e1436faa2235143f2
--- lams_central/web/passwordChangeOkContent.jsp	(.../passwordChangeOkContent.jsp)	(revision 43a81b97418d202b694ee15c30c6069a56370c46)
+++ lams_central/web/passwordChangeOkContent.jsp	(.../passwordChangeOkContent.jsp)	(revision f290dd48e471facda515082e1436faa2235143f2)
@@ -27,7 +27,7 @@
 					
 					<div class="col-xs-12 text-center voffset10">
 						<a class="btn btn-sm btn-default"
-							href="<lams:LAMSURL/>index.do" role="button">
+						href="<lams:LAMSURL/>${empty redirectURL ? 'index.do' : redirectURL}" role="button">
 							Ok
 						</a>
 					</div>
Index: lams_central/web/profile.jsp
===================================================================
diff -u -r353fe07604639c2166ed68fbf832810959f3f3cf -rf290dd48e471facda515082e1436faa2235143f2
--- lams_central/web/profile.jsp	(.../profile.jsp)	(revision 353fe07604639c2166ed68fbf832810959f3f3cf)
+++ lams_central/web/profile.jsp	(.../profile.jsp)	(revision f290dd48e471facda515082e1436faa2235143f2)
@@ -19,22 +19,21 @@
 	<script type="text/javascript" src="includes/javascript/jquery-ui.js"></script>
 	<script type="text/javascript" src="includes/javascript/profile.js"></script>
 	<script type="text/javascript">
+	
 		$(document).ready(function () {
 			//update dialog's height and title
 			updateMyProfileDialogSettings('<fmt:message key="index.myprofile" />', '430');
 		});
 	</script>
 </lams:head>
-
 <body>
+
 <div class="container">
 	<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="col-xs-12 col-sm-8 col-sm-offset-2 col-md-6 col-md-offset-3">
 			<div class="panel voffset20">
 				<div class="panel-body">
 					<div class="text-center">
-
 						<c:choose>
 							<c:when test="${empty portraitUuid}">
 								<div class="text-center">
@@ -73,7 +72,7 @@
 						<c:if test="${authenticationMethodId eq dbId}">
 
 							<a class="btn btn-sm btn-default voffset5"
-								href="index.do?state=active&method=password" role="button"><i
+								href="index.do?state=active&method=password&redirectURL=index.do%3Fstate%3Dactive%26method%3Dprofile" role="button"><i
 								class="fa fa-fw fa-lock"></i> <span class="hidden-xs"><fmt:message
 										key="title.password.change.screen" /></span></i></a>
 						</c:if>