Index: lams_admin/web/user.jsp
===================================================================
diff -u -re4446044c4d5910e2248ff51b4db078cec1e6fc2 -r3a700bea36f1de2740a8af149effeb7544edad63
--- lams_admin/web/user.jsp	(.../user.jsp)	(revision e4446044c4d5910e2248ff51b4db078cec1e6fc2)
+++ lams_admin/web/user.jsp	(.../user.jsp)	(revision 3a700bea36f1de2740a8af149effeb7544edad63)
@@ -243,8 +243,7 @@
 							<label for="login">
 								<fmt:message key="admin.user.login" />:&nbsp;<span class="text-danger">*</span>
 							</label>
-							<form:input id="login" path="login"  maxlength="50"
-									cssClass="form-control form-control-sm"/>
+								<input id="login" name="login" class="form-control form-control-sm" autocomplete="username" type="text" value="${userForm.login}" maxlength="50" required>
 							<small id="loginHelpBlock" class="form-text text-muted">
 								<lams:errors path="login"/>
 							</small>		
@@ -256,8 +255,7 @@
 								<label for="password">
 									<fmt:message key="admin.user.password" />:&nbsp;<span class="text-danger">*</span>
 								</label>
-								<form:input type="password" path="password" 
-									maxlength="25" id="password" cssClass="form-control form-control-sm" />
+									<input id="password" name="password" class="form-control form-control-sm" type="password" value="${userForm.password}" maxlength="25" autocomplete="new-password" required>	
 								<small id="passwordHelpBlock" class="form-text text-muted">
 									<lams:errors path="password"/>
 								</small>		
@@ -268,8 +266,7 @@
 								<label for="password2">
 									<fmt:message key="admin.user.password.confirm" />:&nbsp;<span class="text-danger">*</span>
 								</label>
-								<form:input type="password" path="password2" 
-									maxlength="25" id="password2" cssClass="form-control form-control-sm" />
+								<input id="password2" name="password2" class="form-control form-control-sm" type="password" value="${userForm.password2}" maxlength="25" autocomplete="new-password" required>
 							
 							</div>
 						</c:if>
@@ -292,16 +289,14 @@
 							<label for="title">
 								<fmt:message key="admin.user.title" />:
 							</label>
-							<form:input type="text" path="title" size="32" maxlength="32"
-								id="title" cssClass="form-control form-control-sm"/>
+								<input id="title" name="title" class="form-control form-control-sm" type="text" value="${userForm.title}" size="32" maxlength="32" autocomplete=honorific-prefix">
 						</div>	
 						
 						<div class="form-group">
 							<label for="firstName">
 								<fmt:message key="admin.user.first_name" />:&nbsp;<span class="text-danger">*</span>
 							</label>
-							<form:input path="firstName" 
-								id="firstName" maxlength="128" cssClass="form-control form-control-sm"/>
+								<input id="firstName" name="firstName" required class="form-control form-control-sm" type="text" value="${userForm.firstName}" maxlength="128" autocomplete="given-name">
 							<small id="firstNameHelpBlock" class="form-text text-muted">
 								<lams:errors path="firstName"/>
 							</small>	
@@ -311,8 +306,7 @@
 							<label for="lastName">
 								<fmt:message key="admin.user.last_name" />:&nbsp;<span class="text-danger">*</span>
 							</label>
-							<form:input path="lastName" 
-								id="lastName" maxlength="128" cssClass="form-control form-control-sm"/>
+								<input id="lastName" name="lastName" class="form-control form-control-sm" type="text" value="${userForm.lastName}" required maxlength="128" autocomplete="family-name">
 							<small id="lastNameHelpBlock" class="form-text text-muted">
 								<lams:errors path="lastName"/>
 							</small>	
@@ -322,8 +316,7 @@
 							<label for="email">
 								<fmt:message key="admin.user.email" />:&nbsp;<span class="text-danger">*</span>
 							</label>
-							<form:input path="email" maxlength="128" id="email"
-								cssClass="form-control form-control-sm"/>
+								<input id="email" name="email" class="form-control form-control-sm" type="text" value="${userForm.email}" maxlength="128" required autocomplete="email">
 							<small id="emailHelpBlock" class="form-text text-muted">
 								<lams:errors path="email"/>
 							</small>	
@@ -334,44 +327,40 @@
 							<label for="addressLine1">
 								<fmt:message key="admin.user.address_line_1" />:
 							</label>
-							<form:input path="addressLine1" 
-								maxlength="64" cssClass="form-control form-control-sm"/>
+								<input id="addressLine1" name="addressLine1" class="form-control form-control-sm" type="text" value="${userForm.addressLine1}" maxlength="64" autocomplete="address-line1">
 						</div>
 						
 						
 						<div class="form-group">
 							<label for="addressLine2">
 								<fmt:message key="admin.user.address_line_2" />:
 							</label>	
-							<form:input path="addressLine2" 
-								maxlength="64" cssClass="form-control form-control-sm"/>
+								<input id="addressLine2" name="addressLine2" class="form-control form-control-sm" type="text" value="${userForm.addressLine2}" maxlength="64" autocomplete="address-line2">
 										
 						</div>
 						
 						<div class="form-group">
 							<label for="addressLine3">
 								<fmt:message key="admin.user.address_line_3" />:
 							</label>	
-							<form:input path="addressLine3" 
-								maxlength="64" cssClass="form-control form-control-sm"/>
+								<input id="addressLine3" name="addressLine3" class="form-control form-control-sm" type="text" value="${userForm.addressLine3}" maxlength="64" autocomplete="address-line3">
 										
 						</div>
 						
 						<div class="form-group">
 							<label for="city">
 								<fmt:message key="admin.user.city" />:
 							</label>	
-							<form:input path="city" 
-								maxlength="64" cssClass="form-control form-control-sm"/>
+								<input id="city" name="city" class="form-control form-control-sm" type="text" value="${userForm.city}" maxlength="64" autocomplete="address=line4">
+
 										
 						</div>
 
 						<div class="form-group">
 							<label for="postcode">
 								<fmt:message key="admin.user.postcode" />:
 							</label>	
-							<form:input path="postcode" 
-								maxlength="10" cssClass="form-control form-control-sm"/>
+								<input id="postcode" name="postcode" class="form-control form-control-sm" type="text" value="${userForm.postcode}" value="${userForm.postcode}" maxlength="10">
 										
 						</div>
 
@@ -402,31 +391,24 @@
 							<label for="dayPhone">
 								<fmt:message key="admin.user.day_phone" />:
 							</label>	
-							<form:input path="dayPhone" maxlength="64" cssClass="form-control form-control-sm"/>
+								<input id="dayPhone" name="dayPhone" class="form-control form-control-sm" type="text" value="${userForm.dayPhone}" maxlength="64" autocomplete="tel">
 						</div>
 
 						<div class="form-group">
 							<label for="eveningPhone">
 								<fmt:message key="admin.user.evening_phone" />:
 							</label>	
-							<form:input path="eveningPhone" maxlength="64" cssClass="form-control form-control-sm"/>
+								<input id="eveningPhone" name="eveningPhone" class="form-control form-control-sm" type="text" value="${userForm.eveningPhone}" maxlength="64" autocomplete="tel">
 						</div>
 
 						<div class="form-group">
 							<label for="mobilePhone">
 								<fmt:message key="admin.user.mobile_phone" />:
 							</label>	
-							<form:input path="mobilePhone" maxlength="64" cssClass="form-control form-control-sm"/>
+								<input id="mobilePhone" name="mobilePhone" class="form-control form-control-sm" type="text" value="${userForm.mobilePhone}" maxlength="64" autocomplete="tel">
 						</div>
 																								
 						<div class="form-group">
-							<label for="fax">
-								<fmt:message key="admin.user.fax" />:
-							</label>	
-							<form:input path="fax" maxlength="64" cssClass="form-control form-control-sm"/>
-						</div>
-
-						<div class="form-group">
 							<label for="localeId">
 								<fmt:message key="admin.organisation.locale" />:
 							</label>	
Index: lams_central/web/login.jsp
===================================================================
diff -u -re2956cb8a072cc5ac9ceabaa9dac30c5750bf10b -r3a700bea36f1de2740a8af149effeb7544edad63
--- lams_central/web/login.jsp	(.../login.jsp)	(revision e2956cb8a072cc5ac9ceabaa9dac30c5750bf10b)
+++ lams_central/web/login.jsp	(.../login.jsp)	(revision 3a700bea36f1de2740a8af149effeb7544edad63)
@@ -217,16 +217,16 @@
 							</div>
 						</c:if>
            
-						<form action="/lams/j_security_check" method="POST" name="loginForm" role="form" class="form-signin" id="loginForm" autocomplete="off">
+						<form action="/lams/j_security_check" method="POST" name="loginForm" role="form" class="form-signin" id="loginForm">
            					<input type="hidden" name="redirectURL" value='<c:out value="${param.redirectURL}" escapeXml="true" />' />
            	 
 			            	<div class="form-label-group">
-			              		<input id="j_username" type="text" class="form-control" autocapitalize="off" name="j_username" onkeypress="onEnter(event)" tabindex="1" required autofocus placeholder="aaaaa">
+			              		<input id="j_username" type="text" class="form-control" autocapitalize="off" name="j_username" onkeypress="onEnter(event)" tabindex="1" required autofocus placeholder="aaaaa" autocomplete="username">
 			                	<label for="j_username">Username</label>
 			              	</div>
 			
 			              	<div class="form-label-group">
-			              		<input id="" type="password" class="form-control" name="j_password" onkeypress="onEnter(event)" tabindex="2" required>
+			              		<input id="" type="password" class="form-control" name="j_password" onkeypress="onEnter(event)" tabindex="2" required autocomplete="current-password">
 			                	<label for="j_password">Password</label>
 			              	</div>	
 			              
Index: lams_central/web/signup/loginTab.jsp
===================================================================
diff -u -re2956cb8a072cc5ac9ceabaa9dac30c5750bf10b -r3a700bea36f1de2740a8af149effeb7544edad63
--- lams_central/web/signup/loginTab.jsp	(.../loginTab.jsp)	(revision e2956cb8a072cc5ac9ceabaa9dac30c5750bf10b)
+++ lams_central/web/signup/loginTab.jsp	(.../loginTab.jsp)	(revision 3a700bea36f1de2740a8af149effeb7544edad63)
@@ -1,35 +1,32 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <body>
-	<form:form id="SignupForm" modelAttribute="SignupForm" action="/lams/signup/login.do" method="post" autocomplete="off" >
+	<form:form id="SignupForm" modelAttribute="SignupForm" action="/lams/signup/login.do" method="post">
 		<form:hidden path="submitted" value="1" />
 		<form:hidden path="context" value="${signupOrganisation.context}" />
 		<div class="container">
 			<div class="row vertical-center-row">
 				<div
-					class="col-12 col-md-8 offset-md-2 col-lg-6 offset-lg-3">
+					class="col-xs-12 col-sm-8 col-sm-offset-2 col-md-6 col-md-offset-3">
 					<div class="panel">
 						<div class="panel-body">
 							<div class="form-group">
 								<label for="usernameTab2"><fmt:message key="login.username" /></label>:
-								<form:input path="usernameTab2" size="40" maxlength="255"
-									cssClass="form-control" />
+								<input id="usernameTab2" name="usernameTab2" class="form-control" type="text" value="" size="40" maxlength="255" autocomplete="username">
 								<lams:errors path="usernameTab2"/>
 							</div>
 							<div class="form-group">
-								<label for="passwordTab2"><fmt:message key="login.password" /></label>: <input
-									name="passwordTab2" type="password" size="40" maxlength="255"
-									class="form-control" autocomplete="off" />
+								<label for="passwordTab2"><fmt:message key="login.password" /></label>: 
+								<input name="passwordTab2" type="password" size="40" maxlength="255" class="form-control" autocomplete="current-password">
 								<lams:errors path="passwordTab2"/>
 							</div>
 							<div class="form-group">
 								 <label for="courseKeyTab2"><fmt:message key="login.course.key" /></label>:
-								<form:input path="courseKeyTab2" size="40" maxlength="255"
-									cssClass="form-control" />
+								 <input id="courseKeyTab2" name="courseKeyTab2" class="form-control" type="text" value="" size="40" maxlength="255" autocomplete="one-time-code">
 								<lams:errors path="courseKeyTab2"/>
 							</div>
 							<div class="form-group" align="right">
-								<button class="btn btn-sm btn-secondary voffset5">
+								<button class="btn btn-sm btn-default voffset5">
 									<fmt:message key="login.submit" />
 								</button>
 							</div>
Index: lams_central/web/signup/singupTab.jsp
===================================================================
diff -u -re2956cb8a072cc5ac9ceabaa9dac30c5750bf10b -r3a700bea36f1de2740a8af149effeb7544edad63
--- lams_central/web/signup/singupTab.jsp	(.../singupTab.jsp)	(revision e2956cb8a072cc5ac9ceabaa9dac30c5750bf10b)
+++ lams_central/web/signup/singupTab.jsp	(.../singupTab.jsp)	(revision 3a700bea36f1de2740a8af149effeb7544edad63)
@@ -13,7 +13,7 @@
 <script type="text/javascript" src="/lams/includes/javascript/jquery.js"></script>
 <script type="text/javascript" src="/lams/includes/javascript/jquery-ui.js"></script>
 <script type="text/javascript" src="/lams/includes/javascript/jquery.validate.js"></script>
-<script type="text/javascript" src="/lams/includes/javascript/bootstrap.js"></script>
+<script type="text/javascript" src="/lams/includes/javascript/bootstrap.min.js"></script>
 <script type="text/javascript">
 	var mustHaveUppercase = ${mustHaveUppercase},
 	mustHaveNumerics  = ${mustHaveNumerics},
@@ -52,7 +52,6 @@
 	$(function() {
 		// Setup form validation 
 		$("#SignupForm").validate({
-							debug : true,
 							errorClass : 'help-block',
 							//  validation rules
 							rules : {
@@ -142,26 +141,25 @@
 	});
 </script>
 <div>
-	<form:form modelAttribute="SignupForm" id="SignupForm" name="SignupForm" method="post" action="/lams/signup/signup.do" novalidate="novalidate"  autocomplete="off">
+	<form:form modelAttribute="SignupForm" id="SignupForm" name="SignupForm" method="post" action="/lams/signup/signup.do" novalidate="novalidate">
 		<form:hidden path="submitted" value="1" />
 		<form:hidden path="context" value="${signupOrganisation.context}" />
 		<div class="container">
 			<div class="row vertical-center-row">
 				<div
-					class="col-12 col-md-8 offset-md-2 col-lg-6 offset-lg-3">
+					class="col-xs-12 col-sm-8 col-sm-offset-2 col-md-6 col-md-offset-3">
 					<div class="panel">
 						<div class="panel-body">
 
 							<div class="form-group">
 								<label for="username"><fmt:message key="signup.username" /></label>:
-								<form:input path="username" size="40" maxlength="255"
-									cssClass="form-control" />
+								<input id="username" name="username" class="form-control" type="text" value="" size="40" maxlength="255" autocomplete="username">
 								<lams:errors path="username"/>
 								<span style="display: none;'" class="msg error"> <fmt:message
 										key="error.username.invalid.characters" /></span>
 							</div>
 
-							<div class="col-12">
+							<div class="col-xs-12">
 								<lams:Alert type="info" id="passwordConditions" close="false">
 									<strong><fmt:message key='label.password.must.contain' />:</strong>
 									<ul class="list-unstyled" style="line-height: 1.2">
@@ -192,24 +190,21 @@
 							<div class="form-group">
 								<label for="password"><fmt:message key="signup.password" /></label>:
 
-								<form:password path="password" size="40"
-									cssClass="form-control" maxlength="25" />
+								<input id="password" name="password" class="form-control" type="password" value="" size="40" maxlength="25" autocomplete="new-password">
 								<lams:errors path="password"/>
 							</div>
 
 							<div class="form-group">
 								<label for="confirmPassword"><fmt:message key="signup.confirm.password" /></label>:
 
-								<form:password path="confirmPassword" size="40"
-									maxlength="25" cssClass="form-control" />
+								<input id="confirmPassword" name="confirmPassword" class="form-control" type="password" value="" size="40" maxlength="25" autocomplete="new-password">
 								<span style="display: none;'" class="confirmPassword error"><fmt:message
 										key="error.passwords.unequal" /></span>
 							</div>
 							<div class="form-group">
 								<label for="firstName"><fmt:message key="signup.first.name" /></label>:
 
-								<form:input path="firstName" size="40" maxlength="255"
-									cssClass="form-control" />
+								<input id="firstName" name="firstName" class="form-control valid" type="text" value="" size="40" maxlength="255" autocomplete="given-name">
 								<lams:errors path="firstName"/>
 								<span style="display: none;'" class="first error"><fmt:message
 										key="error.firstname.invalid.characters" /></span>
@@ -218,17 +213,15 @@
 							<div class="form-group">
 								<label for="lastName"><fmt:message key="signup.last.name" /></label>:
 
-								<form:input path="lastName" size="40" maxlength="255"
-									cssClass="form-control" />
+								<input id="lastName" name="lastName" class="form-control valid" type="text" value="" size="40" maxlength="255" autocomplete="family-name">
 								<lams:errors path="lastName"/>
 								<span style="display: none;'" class="last error"><fmt:message
 										key="error.lastname.invalid.characters" /></span>
 							</div>
 							<div class="form-group">
 								<label for="email"><fmt:message key="signup.email" /></label>:
 
-								<form:input path="email" size="40" maxlength="255"
-									cssClass="form-control" />
+								<input id="email" name="email" class="form-control" type="text" value="" size="40" maxlength="255" autocomplete="email">
 								<lams:errors path="email"/>
 								<span style="display: none;'" class="email error"><fmt:message
 										key="error.email.invalid.format" /></span>
@@ -237,8 +230,7 @@
 							<div class="form-group">
 								<label for="confirmEmail"><fmt:message key="signup.confirm.email" /></label>:
 
-								<form:input path="confirmEmail" size="40" maxlength="255"
-									cssClass="form-control" />
+								<input id="confirmEmail" name="confirmEmail" class="form-control" type="text" value="" size="40" maxlength="255" autocomplete="email">
 								<span style="display: none;'" class="confirmEmail error"><fmt:message
 										key="error.emails.unequal" /></span>
 							</div>
@@ -265,14 +257,13 @@
 							<div class="form-group">
 								<label for="courseKey"><fmt:message key="signup.course.key" /></label>:
 
-								<form:input path="courseKey" size="40" maxlength="255"
-									cssClass="form-control" />
+								<input id="courseKey" name="courseKey" class="form-control" type="text" value="" size="40" maxlength="255" autocomplete="one-time-code">
 								<lams:errors path="courseKey"/>
 							</div>
 
 							<div class="form-group" align="right">
 								<button id="submitButton"
-										class="btn btn-sm btn-secondary voffset5"
+										class="btn btn-sm btn-default voffset5"
 									    data-loading-text="<i class='fa fa-circle-o-notch fa-spin'></i><span> <fmt:message key='login.submit' /></span>"
 									    onClick="javascript:$(this).button('loading');$('#SignupForm').submit()"
 								>