diff --git a/src/main/java/runner/repositories/CustomerRepo.java b/src/main/java/runner/repositories/CustomerRepo.java
index 442c3e7ac..eb23125b1 100644
--- a/src/main/java/runner/repositories/CustomerRepo.java
+++ b/src/main/java/runner/repositories/CustomerRepo.java
@@ -19,4 +19,5 @@ public interface CustomerRepo extends CrudRepository<Customer,Long> {
             value = "SELECT username FROM LOGIN",
             nativeQuery = true)
     List<String> findAllLoginsNative();
+    List<Customer> findAll();
 }
\ No newline at end of file
diff --git a/src/main/java/runner/services/CustomerServices.java b/src/main/java/runner/services/CustomerServices.java
index 8f79b49ec..bcdf7cd2a 100644
--- a/src/main/java/runner/services/CustomerServices.java
+++ b/src/main/java/runner/services/CustomerServices.java
@@ -58,7 +58,8 @@ public Customer createCustomer(Customer customer) throws Exception {
     //Check if the username already exist
     public Boolean checkLogin(Login login) {
         loggerService.log(Level.INFO, "I am in first line of checkLogin");
-        List<String> logins= customerRepo.findAllLoginsNative();
+        //List<String> logins= customerRepo.findAllLoginsNative();
+        List<String> logins= customerRepo.findAll().stream().map(Customer::getLogin).map(Login::getUsername).collect(Collectors.toList());
         loggerService.log(Level.INFO, "I am have passed customerRepo.findAllLoginsNative");
         long count = logins.stream().filter(name -> name.equalsIgnoreCase(login.getUsername())).count();
         return count!=0 ? true:false;