Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml,v
diff -u -r1.35.2.11 -r1.35.2.12
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml	27 Oct 2016 16:00:52 -0000	1.35.2.11
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml	29 Nov 2016 09:00:47 -0000	1.35.2.12
@@ -424,6 +424,12 @@
 				not-null="false"
 			</meta>
 		</property>
+		
+		<property name="failedAttempts" type="java.lang.Integer" column="failed_attempts"/>
+		
+		<property name="lockOutTime" type="java.sql.Timestamp"
+			column="lock_out_time" not-null="false" length="19">
+		</property>
 
 	</class>
 
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java,v
diff -u -r1.50.2.10 -r1.50.2.11
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	27 Oct 2016 16:00:52 -0000	1.50.2.10
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	29 Nov 2016 09:00:11 -0000	1.50.2.11
@@ -21,7 +21,6 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.usermanagement;
 
 import java.io.Serializable;
@@ -53,9 +52,13 @@
      * persistent field
      */
     private String password;
-    
+
+    private Integer failedAttempts;
+
+    private Date lockOutTime;
+
     private Boolean twoFactorAuthenticationEnabled;
-    
+
     private String twoFactorAuthenticationSecret;
 
     /**
@@ -128,7 +131,7 @@
 
     /** persistent field */
     private Set<UserOrganisation> userOrganisations;
-    
+
     /** persistent field */
     private Integer lastVisitedOrganisationId;
 
@@ -213,15 +216,15 @@
     public void setSalt(String salt) {
 	this.salt = salt;
     }
-    
+
     public Boolean isTwoFactorAuthenticationEnabled() {
 	return twoFactorAuthenticationEnabled;
     }
 
     public void setTwoFactorAuthenticationEnabled(Boolean twoFactorAuthenticationEnabled) {
 	this.twoFactorAuthenticationEnabled = twoFactorAuthenticationEnabled;
     }
-    
+
     public String getTwoFactorAuthenticationSecret() {
 	return twoFactorAuthenticationSecret;
     }
@@ -401,7 +404,7 @@
     public void setUserOrganisations(Set userOrganisations) {
 	this.userOrganisations = userOrganisations;
     }
-    
+
     public Integer getLastVisitedOrganisationId() {
 	return lastVisitedOrganisationId;
     }
@@ -540,7 +543,7 @@
      */
     public boolean hasMemberAccess(WorkspaceFolder workspaceFolder) {
 	for (UserOrganisation userOrganisation : userOrganisations) {
-		// not all orgs have a folder
+	    // not all orgs have a folder
 	    Set<WorkspaceFolder> folders = userOrganisation.getOrganisation().getWorkspaceFolders();
 	    if (folders != null) {
 		if (checkFolders(folders, workspaceFolder.getWorkspaceFolderId())) {
@@ -659,4 +662,20 @@
     public void setModifiedDate(Date modifiedDate) {
 	this.modifiedDate = modifiedDate;
     }
+
+    public Integer getFailedAttempts() {
+        return failedAttempts;
+    }
+
+    public void setFailedAttempts(Integer failedAttempts) {
+        this.failedAttempts = failedAttempts;
+    }
+
+    public Date getLockOutTime() {
+	return lockOutTime;
+    }
+
+    public void setLockOutTime(Date lockOutTime) {
+	this.lockOutTime = lockOutTime;
+    }
 }
\ No newline at end of file