diff --git a/lib/classes/task/send_new_user_passwords_task.php b/lib/classes/task/send_new_user_passwords_task.php
index 678b29a40c7..6c27a97728f 100644
--- a/lib/classes/task/send_new_user_passwords_task.php
+++ b/lib/classes/task/send_new_user_passwords_task.php
@@ -44,8 +44,12 @@ public function get_name() {
     public function execute() {
         global $DB;
 
+        $select = $DB->sql_compare_text('name') . ' = ? AND ' . $DB->sql_compare_text('value') . ' = ?';
+        $params = array('create_password', '1');
+
         // Generate new password emails for users - ppl expect these generated asap.
-        if ($DB->count_records('user_preferences', array('name' => 'create_password', 'value' => '1'))) {
+        //if ($DB->count_records('user_preferences', array('name' => 'create_password', 'value' => '1'))) {
+        if ($DB->count_records_select('user_preferences', $select, $params)) {
             mtrace('Creating passwords for new users...');
             $userfieldsapi = \core_user\fields::for_name();
             $usernamefields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;