Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.100.2.15 -r1.100.2.16
--- lams_admin/conf/language/lams/ApplicationResources.properties	28 Oct 2016 07:06:27 -0000	1.100.2.15
+++ lams_admin/conf/language/lams/ApplicationResources.properties	4 Nov 2016 08:24:34 -0000	1.100.2.16
@@ -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/user.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/user.jsp,v
diff -u -r1.29.2.7 -r1.29.2.8
--- lams_admin/web/user.jsp	30 Oct 2016 06:06:19 -0000	1.29.2.7
+++ lams_admin/web/user.jsp	4 Nov 2016 08:26:18 -0000	1.29.2.8
@@ -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_admin/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/Attic/struts-config.xml,v
diff -u -r1.1.2.4 -r1.1.2.5
--- lams_admin/web/WEB-INF/struts-config.xml	28 Sep 2016 15:13:45 -0000	1.1.2.4
+++ lams_admin/web/WEB-INF/struts-config.xml	4 Nov 2016 08:25:18 -0000	1.1.2.5
@@ -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_central/web/passwordChangeOkContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/passwordChangeOkContent.jsp,v
diff -u -r1.5.22.1 -r1.5.22.2
--- lams_central/web/passwordChangeOkContent.jsp	24 Oct 2016 14:55:28 -0000	1.5.22.1
+++ lams_central/web/passwordChangeOkContent.jsp	4 Nov 2016 08:28:09 -0000	1.5.22.2
@@ -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>