Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r6bea5e1dfbe2ddf5a329e1859851a54d75342237 -r43a81b97418d202b694ee15c30c6069a56370c46
--- lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 6bea5e1dfbe2ddf5a329e1859851a54d75342237)
+++ lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 43a81b97418d202b694ee15c30c6069a56370c46)
@@ -73,6 +73,7 @@
 admin.user.login  =Login
 admin.user.password  =Password
 admin.user.password.confirm  =Confirm password
+admin.user.change.password  =Force Password Change
 admin.user.name  =Name
 admin.user.title  =Title
 admin.user.first_name  =First name
Index: lams_admin/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r11b64f81e406ff277c7c35988304b0064300de57 -r43a81b97418d202b694ee15c30c6069a56370c46
--- lams_admin/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 11b64f81e406ff277c7c35988304b0064300de57)
+++ lams_admin/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 43a81b97418d202b694ee15c30c6069a56370c46)
@@ -66,6 +66,7 @@
 	<form-property name="login" type="java.lang.String" />
 	<form-property name="password" type="java.lang.String" />
 	<form-property name="password2" type="java.lang.String" />
+	<form-property name="changePassword" type="java.lang.String" />
 	<form-property name="salt" type="java.lang.String" />
 	<form-property name="authenticationMethodId" type="java.lang.Integer" />
 	<form-property name="title" type="java.lang.String" />
Index: lams_admin/web/user.jsp
===================================================================
diff -u -r5b379cb069d705240c6402e6064db40e354ed6cb -r43a81b97418d202b694ee15c30c6069a56370c46
--- lams_admin/web/user.jsp	(.../user.jsp)	(revision 5b379cb069d705240c6402e6064db40e354ed6cb)
+++ lams_admin/web/user.jsp	(.../user.jsp)	(revision 43a81b97418d202b694ee15c30c6069a56370c46)
@@ -330,6 +330,11 @@
 							</c:forEach>
 						</html:select></td>
 				</tr>
+				<tr>
+					<td class="align-right"><fmt:message key="admin.user.change.password" />:</td>
+					<td><html-el:checkbox property="changePassword" value="true"
+						 styleId="changePassword"  /></td>
+				</tr>
 			</table>
 
 			<div class="pull-right">
Index: lams_central/web/passwordChangeOkContent.jsp
===================================================================
diff -u -rc33d82bf97152099b7a309a156ec2707239b622c -r43a81b97418d202b694ee15c30c6069a56370c46
--- lams_central/web/passwordChangeOkContent.jsp	(.../passwordChangeOkContent.jsp)	(revision c33d82bf97152099b7a309a156ec2707239b622c)
+++ lams_central/web/passwordChangeOkContent.jsp	(.../passwordChangeOkContent.jsp)	(revision 43a81b97418d202b694ee15c30c6069a56370c46)
@@ -27,7 +27,7 @@
 					
 					<div class="col-xs-12 text-center voffset10">
 						<a class="btn btn-sm btn-default"
-							href="index.do?state=active&method=profile" role="button">
+							href="<lams:LAMSURL/>index.do" role="button">
 							Ok
 						</a>
 					</div>