diff --git a/username_policy.module b/username_policy.module
index 174df02..32fedc5 100644
--- a/username_policy.module
+++ b/username_policy.module
@@ -144,7 +144,9 @@ $pattern = \Drupal::config('username_policy.settings')->get('username_policy_pat
     // Generate username pattern.
     $generated_pattern = str_replace($for_display_array, $for_query_array, $pattern);
     // If username exist add incremental value.
-    $result = db_query('SELECT * FROM {users} WHERE name LIKE :pattern', array(':pattern' => db_like($generated_pattern) . '%'));
+//    $result = db_query('SELECT * FROM {users} WHERE name LIKE :pattern', array(':pattern' => db_like($generated_pattern) . '%'));
+    $result = \Drupal::database()->select('users', 'unp');
+    $result->fields('unp', ['uid', 'uuid','langcode']);
     $user_name_count = $result->rowCount();
 
     $form_state_values['name'] = $generated_pattern;