diff --git a/src/main/java/com/iemr/common/service/users/IEMRAdminUserServiceImpl.java b/src/main/java/com/iemr/common/service/users/IEMRAdminUserServiceImpl.java
index d8d4abe8..e411b9ef 100644
--- a/src/main/java/com/iemr/common/service/users/IEMRAdminUserServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/users/IEMRAdminUserServiceImpl.java
@@ -308,7 +308,13 @@ private void handleFailedLoginAttempt(User user, int failedAttemptThreshold) thr
 			user.setFailedAttempt(currentAttempts + 1);
 			iEMRUserRepositoryCustom.save(user);
 			logger.warn("User Password Wrong");
-			throw new IEMRException("Invalid username or password");
+			int remainingAttempts = failedAttemptThreshold - (currentAttempts + 1);
+			if (remainingAttempts == 1) {
+				throw new IEMRException(
+						"Invalid username or password. Remaining attempts: 1. "
+								+ "If you enter wrong username or password again, your account will be locked.");
+			}
+			throw new IEMRException("Invalid username or password. Remaining attempts: " + remainingAttempts);
 		} else {
 			java.sql.Timestamp lockTime = new java.sql.Timestamp(System.currentTimeMillis());
 			user.setFailedAttempt(currentAttempts + 1);
@@ -317,7 +323,8 @@ private void handleFailedLoginAttempt(User user, int failedAttemptThreshold) thr
 			iEMRUserRepositoryCustom.save(user);
 			logger.warn("User Account has been locked after reaching the limit of {} failed login attempts.",
 					failedAttemptThreshold);
-			throw new IEMRException(generateLockoutErrorMessage(lockTime));
+			throw new IEMRException(
+					"Your account has been locked due to multiple failed login attempts. Please contact administrator.");
 		}
 	}