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.20 -r1.100.2.21
--- lams_admin/conf/language/lams/ApplicationResources.properties	29 Nov 2016 09:14:51 -0000	1.100.2.20
+++ lams_admin/conf/language/lams/ApplicationResources.properties	1 Dec 2016 07:46:53 -0000	1.100.2.21
@@ -537,7 +537,7 @@
 label.password.min.length  =must be at least {0} characters long
 label.password.old.must.entered  =Old password must be entered
 label.password.symbols.allowed  =Only these symbols are allowed
-label.password.restrictions  =Password must follow the restrictions shown above
+label.password.restrictions  =Password must follow the restrictions shown 
 label.password.must.contain  =Password must contain
 label.password.must.ucase  =at least 1 upper case letter
 label.password.must.lcase  =at least 1 lower case letter
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java,v
diff -u -r1.20.2.7 -r1.20.2.8
--- lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java	29 Nov 2016 10:22:57 -0000	1.20.2.7
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java	1 Dec 2016 07:46:26 -0000	1.20.2.8
@@ -20,7 +20,6 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.admin.service;
 
 import java.io.IOException;
@@ -242,7 +241,7 @@
 	Organisation org = new Organisation();
 	String[] args = new String[1];
 
-	String name = StringUtils.substring(parseStringCell(row.getCell(ImportService.NAME)),0,240);
+	String name = StringUtils.substring(parseStringCell(row.getCell(ImportService.NAME)), 0, 240);
 
 	//validate organisation name
 	if (StringUtils.isBlank(name)) {
@@ -520,6 +519,11 @@
 	    hasError = true;
 	    return null;
 	}
+	if (!ValidationUtil.isPasswordValueValid(password, password)) {
+	    rowResult.add(messageService.getMessage("label.password.restrictions"));
+	    hasError = true;
+	    return null;
+	}
 	String salt = HashUtil.salt();
 	password = HashUtil.sha256(password, salt);
 	user.setSalt(salt);
Index: lams_admin/web/import/importexcel.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/import/importexcel.jsp,v
diff -u -r1.12.12.2 -r1.12.12.3
--- lams_admin/web/import/importexcel.jsp	16 Jun 2016 03:10:21 -0000	1.12.12.2
+++ lams_admin/web/import/importexcel.jsp	1 Dec 2016 07:47:25 -0000	1.12.12.3
@@ -1,44 +1,95 @@
 <%@ include file="/taglibs.jsp"%>
-<%@ page import="org.lamsfoundation.lams.admin.service.IImportService" %>
+<%@ page import="org.lamsfoundation.lams.admin.service.IImportService"%>
+<%@ page import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 
+<c:set var="minNumChars"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_MINIMUM_CHARACTERS)%></c:set>
+<c:set var="mustHaveUppercase"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_UPPERCASE)%></c:set>
+<c:set var="mustHaveLowercase"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_LOWERCASE)%></c:set>
+<c:set var="mustHaveNumerics"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_NUMERICS)%></c:set>
+<c:set var="mustHaveSymbols"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_SYMBOLS)%></c:set>
+
 <script language="javascript" type="text/JavaScript">
 	function goToStatus() {
 		document.location = '<lams:LAMSURL/>/admin/import/status.jsp';
 	}
 </script>
 
-<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
+<p>
+	<a href="<lams:LAMSURL/>/admin/sysadminstart.do"
+		class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a>
+</p>
 
-<p><fmt:message key="msg.import.intro"/></p>
 <p>
+	<fmt:message key="msg.import.intro" />
+</p>
+<p>
 <ul>
-	<li>
-		<fmt:message key="msg.import.1"/>
-	</li>
-	<li>
-		<fmt:message key="msg.import.2"/>
-		<ul><li><p><a href="file/lams_users_template.xls">lams_users_template.xls</a></p></li></ul>
-	</li>
-	<li>
-		<fmt:message key="msg.import.3"/>
-		<ul><li><p><a href="file/lams_roles_template.xls">lams_roles_template.xls</a></p></li></ul>
-	</li>
+	<li><fmt:message key="msg.import.1" /></li>
+	<li><fmt:message key="msg.import.2" />
+		<ul>
+			<li><p>
+					<a href="file/lams_users_template.xls">lams_users_template.xls</a>
+				</p></li>
+		</ul></li>
+	<li><fmt:message key="msg.import.3" />
+		<ul>
+			<li><p>
+					<a href="file/lams_roles_template.xls">lams_roles_template.xls</a>
+				</p></li>
+		</ul></li>
 </ul>
 </p>
-<p><fmt:message key="msg.import.conclusion"/></p>
+<div class ="pull-left">
+	<lams:Alert type="info" close="false">
+		<strong><fmt:message key='label.password.must.contain' />:</strong>
+		<ul style="line-height: 1.2">
+			<li><span class="fa fa-check"></span> <fmt:message
+					key='label.password.min.length'>
+					<fmt:param value='${minNumChars}' />
+				</fmt:message></li>
+			<c:if test="${mustHaveUppercase}">
+				<li><span class="fa fa-check"></span> <fmt:message
+						key='label.password.must.ucase' /></li>
+			</c:if>
+			<c:if test="${mustHaveLowercase}">
+				<li><span class="fa fa-check"></span> <fmt:message
+						key='label.password.must.lcase' /></li>
+			</c:if>
+			<c:if test="${mustHaveNumerics}">
+				<li><span class="fa fa-check"></span> <fmt:message
+						key='label.password.must.number' /></li>
+			</c:if>
+			<c:if test="${mustHaveSymbols}">
+				<li><span class="fa fa-check"></span> <fmt:message
+						key='label.password.must.symbol' /></li>
+			</c:if>
+		</ul>
+	</lams:Alert>
+</div>
+<p>
+	<fmt:message key="msg.import.conclusion" />
+</p>
 
-<html:form action="/importexcelsave.do" method="post" enctype="multipart/form-data" onsubmit="goToStatus();">
-<html:hidden property="orgId" />
+<html:form action="/importexcelsave.do" method="post"
+	enctype="multipart/form-data" onsubmit="goToStatus();">
+	<html:hidden property="orgId" />
 
-<table>
-	<tr>
-		<td align="right"><fmt:message key="label.excel.spreadsheet" />:&nbsp;</td>
-		<td><html:file property="file" styleClass="form-control"/></td>
-	</tr>
-</table>
-<div class="pull-right">
-<html:cancel styleId="cancelButton" styleClass="btn btn-default"><fmt:message key="admin.cancel"/></html:cancel>
-<html:submit styleId="importButton" styleClass="btn btn-primary loffset5"><fmt:message key="label.import"/></html:submit> &nbsp; 	
-</div>
+	<table>
+		<tr>
+			<td align="right"><fmt:message key="label.excel.spreadsheet" />:&nbsp;</td>
+			<td><html:file property="file" styleClass="form-control" /></td>
+		</tr>
+	</table>
+	<div class="pull-right">
+		<html:cancel styleId="cancelButton" styleClass="btn btn-default">
+			<fmt:message key="admin.cancel" />
+		</html:cancel>
+		<html:submit styleId="importButton"
+			styleClass="btn btn-primary loffset5">
+			<fmt:message key="label.import" />
+		</html:submit>
+		&nbsp;
+	</div>
 
 </html:form>
\ No newline at end of file