Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java,v
diff -u -r1.28 -r1.29
--- lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	17 Nov 2006 06:08:39 -0000	1.28
+++ lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	21 Nov 2006 05:09:49 -0000	1.29
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java,v
diff -u -r1.9 -r1.10
--- lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java	6 Nov 2006 00:43:18 -0000	1.9
+++ lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java	21 Nov 2006 05:09:49 -0000	1.10
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/passwordChangeOkContent.jsp,v
diff -u -r1.4 -r1.5
--- lams_central/web/passwordChangeOkContent.jsp	10 Aug 2006 04:03:53 -0000	1.4
+++ lams_central/web/passwordChangeOkContent.jsp	21 Nov 2006 05:09:50 -0000	1.5
@@ -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>