diff --git a/keycloak/sms-provider/src/main/java/org/sunbird/keycloak/login/phone/AbstractPhoneFormAuthenticator.java b/keycloak/sms-provider/src/main/java/org/sunbird/keycloak/login/phone/AbstractPhoneFormAuthenticator.java
index 6b1e41ab..5e91e2c4 100755
--- a/keycloak/sms-provider/src/main/java/org/sunbird/keycloak/login/phone/AbstractPhoneFormAuthenticator.java
+++ b/keycloak/sms-provider/src/main/java/org/sunbird/keycloak/login/phone/AbstractPhoneFormAuthenticator.java
@@ -183,13 +183,12 @@ private UserModel getUser(AuthenticationFlowContext context, String username) {
                 logger.error("AbstractPhoneFormAuthenticator@getUser : Users List - " + userModels.size());
                 logger.error("AbstractPhoneFormAuthenticator@getUser : First User - " + userModels.get(0).getUsername());
                 return userModels.get(0);
+            } else {
+                return KeycloakModelUtils.findUserByNameOrEmail(context.getSession(), context.getRealm(), username);
             }
         } else {
             return KeycloakModelUtils.findUserByNameOrEmail(context.getSession(), context.getRealm(), username);
         }
-
-        logger.error("AbstractPhoneFormAuthenticator@getUser : No user found!");
-        return null;
     }
 
     public boolean validatePassword(AuthenticationFlowContext context, UserModel user, MultivaluedMap<String, String> inputData) {