diff --git a/mod/data/view.php b/mod/data/view.php
index 8748c0c41ca..97aae265637 100644
--- a/mod/data/view.php
+++ b/mod/data/view.php
@@ -371,7 +371,12 @@
                 echo $OUTPUT->notification(get_string('recorddeleted','data'), 'notifysuccess');
             }
         } else {   // Print a confirmation page
-            if ($deleterecord = $DB->get_record('data_records', array('id'=>$delete))) {   // Need to check this is valid
+            $allnamefields = get_all_user_name_fields(true, 'u');
+            $dbparams = array($delete);
+            if ($deleterecord = $DB->get_record_sql("SELECT dr.*, $allnamefields
+                                                       FROM {data_records} dr
+                                                            JOIN {user} u on dr.userid = u.id
+                                                      WHERE dr.id = ?", $dbparams, MUST_EXIST)) { // Need to check this is valid.
                 if ($deleterecord->dataid == $data->id) {                       // Must be from this database
                     $deletebutton = new single_button(new moodle_url('/mod/data/view.php?d='.$data->id.'&delete='.$delete.'&confirm=1'), get_string('delete'), 'post');
                     echo $OUTPUT->confirm(get_string('confirmdeleterecord','data'),