Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
===================================================================
diff -u -rb636e90f9c1205e0c8a802b72816bf18f87aecac -re3bc6fc68e7c64c4771a1f9a3056e4d750bea26d
--- lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	(.../IndexAction.java)	(revision b636e90f9c1205e0c8a802b72816bf18f87aecac)
+++ lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	(.../IndexAction.java)	(revision e3bc6fc68e7c64c4771a1f9a3056e4d750bea26d)
@@ -72,6 +72,7 @@
  * @struts.action-forward name="profile" path="/profile.do?method=view"
  * @struts.action-forward name="editprofile" path="/profile.do?method=edit"
  * @struts.action-forward name="password" path="/password.do"
+ * @struts.action-forward name="passwordChanged" path=".passwordChangeOk"
  * @struts.action-forward name="portrait" path="/portrait.do"
  * @struts.action-forward name="content" path="/indexContent.jsp"
  */
@@ -103,6 +104,9 @@
 			return mapping.findForward("editprofile");
 		} else if (StringUtils.equals(tab, "password")) {
 			return mapping.findForward("password");
+		} else if (StringUtils.equals(tab, "passwordChanged")) {
+			request.setAttribute("tab", "profile");
+			return mapping.findForward("passwordChanged");
 		} else if (StringUtils.equals(tab, "portrait")) {
 			return mapping.findForward("portrait");
 		} else if (StringUtils.equals(tab, "community")) {
Index: lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java
===================================================================
diff -u -re55d23b8e9a54ee0cfed58cb167510e8d2551fe4 -re3bc6fc68e7c64c4771a1f9a3056e4d750bea26d
--- lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java	(.../PasswordChangeAction.java)	(revision e55d23b8e9a54ee0cfed58cb167510e8d2551fe4)
+++ lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java	(.../PasswordChangeAction.java)	(revision e3bc6fc68e7c64c4771a1f9a3056e4d750bea26d)
@@ -52,7 +52,7 @@
  * 				input=".passwordChange"
  * 				validate="false"
  * 
- * @struts:action-forward name="okay" path=".passwordChangeOk"
+ * @struts:action-forward name="okay" path="/index.do?state=active&tab=passwordChanged"
  * @struts:action-forward name="cancelled" path="/index.do?state=active&tab=profile"
  * @struts:action-forward name="errors" path="/index.do?state=active&tab=password"
  */
Index: lams_central/web/passwordChangeOkContent.jsp
===================================================================
diff -u -rac5331c882a6a910497ef7f730153a000132aab2 -re3bc6fc68e7c64c4771a1f9a3056e4d750bea26d
--- lams_central/web/passwordChangeOkContent.jsp	(.../passwordChangeOkContent.jsp)	(revision ac5331c882a6a910497ef7f730153a000132aab2)
+++ lams_central/web/passwordChangeOkContent.jsp	(.../passwordChangeOkContent.jsp)	(revision e3bc6fc68e7c64c4771a1f9a3056e4d750bea26d)
@@ -6,7 +6,7 @@
 			<p class=body><fmt:message key="msg.password.changed"/></p>
 			<p class=body>	
 				<input type="submit" class="button" value="Ok"
-					onClick="javascript:document.location='profile.do?method=view';" />
+					onClick="javascript:document.location='index.do?state=active&tab=profile';" />
 			</p>
 		</td>
 	</tr>