Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rccae5ec14269c8b244a2d0af05bc0050483fbfeb -r123a342fd0ad050be52a22a4a200c3c5b4a48919
--- lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision ccae5ec14269c8b244a2d0af05bc0050483fbfeb)
+++ lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 123a342fd0ad050be52a22a4a200c3c5b4a48919)
@@ -534,4 +534,5 @@
 admin.org.password.change.generate =Generate new password
 admin.org.password.change.email =Email new password
 admin.org.password.change.force =Force change password after login
+admin.org.password.change.custom =Enter own password or generate one
 #======= End labels: Exported 511 labels for en AU =====
Index: lams_admin/web/orgPasswordChange.jsp
===================================================================
diff -u -ra8aca70caaf4061a12aede0a2f7a9c608e7766e9 -r123a342fd0ad050be52a22a4a200c3c5b4a48919
--- lams_admin/web/orgPasswordChange.jsp	(.../orgPasswordChange.jsp)	(revision a8aca70caaf4061a12aede0a2f7a9c608e7766e9)
+++ lams_admin/web/orgPasswordChange.jsp	(.../orgPasswordChange.jsp)	(revision 123a342fd0ad050be52a22a4a200c3c5b4a48919)
@@ -17,7 +17,7 @@
 	.changeContainer .pass {
 		display: inline-block;
 		margin-left: 20px;
-		width: 200px;
+		width: 260px;
 	}
 	.changeContainer .fa {
 		cursor: pointer;
@@ -178,6 +178,8 @@
 					</td>
 					<td>
 						<input type="text" id="staffPass" name="staffPass" class="pass form-control" maxlength="25"
+						       placeholder="<fmt:message key='admin.org.password.change.custom' />"
+						       title="<fmt:message key='admin.org.password.change.custom' />"
 							   value="<bean:write name='OrgPasswordChangeForm' property='staffPass' />" />
 						<i class="fa fa-refresh generatePassword" title="<fmt:message key='admin.org.password.change.generate' />"></i>
 					</td>
@@ -191,6 +193,8 @@
 					</td>
 					<td>
 						<input type="text" id="learnerPass" name="learnerPass" class="pass form-control" maxlength="25"
+							   placeholder="<fmt:message key='admin.org.password.change.custom' />"
+						       title="<fmt:message key='admin.org.password.change.custom' />"
 							   value="<bean:write name='OrgPasswordChangeForm' property='learnerPass' />" />
 						<i class="fa fa-refresh generatePassword" title="<fmt:message key='admin.org.password.change.generate' />"></i>
 					</td>