diff --git a/mod/feedback/lib.php b/mod/feedback/lib.php
index 86619262f9a..97ec41e9ee9 100644
--- a/mod/feedback/lib.php
+++ b/mod/feedback/lib.php
@@ -736,7 +736,7 @@ function feedback_get_incomplete_users($cm, $group = false, $sort = '', $startpa
 
     //now get all completeds
     if(!$completedusers = $DB->get_records_menu('feedback_completed', array('feedback'=>$cm->instance), '', 'userid,id')){
-        return false;
+        return $allusers;
     }
     $completedusers = array_keys($completedusers);
 
diff --git a/mod/feedback/show_nonrespondents.php b/mod/feedback/show_nonrespondents.php
index 132bf4ccfb9..aec85cc0ceb 100644
--- a/mod/feedback/show_nonrespondents.php
+++ b/mod/feedback/show_nonrespondents.php
@@ -19,8 +19,8 @@
     $subject = optional_param('subject','',PARAM_CLEANHTML);
     $message = optional_param('message','',PARAM_CLEANHTML);
     $format = optional_param('format',FORMAT_MOODLE,PARAM_INT);
-    $messageuser = optional_param('messageuser',PARAM_INT);
-    $action = optional_param('action',PARAM_ALPHA);
+    $messageuser = optional_param('messageuser', false, PARAM_INT);
+    $action = optional_param('action', '',PARAM_ALPHA);
     $perpage = optional_param('perpage', FEEDBACK_DEFAULT_PAGE_COUNT, PARAM_INT);  // how many per page
     $showall = optional_param('showall', false, PARAM_INT);  // should we show all users
     // $SESSION->feedback->current_tab = $do_show;
@@ -68,7 +68,7 @@
 
     require_capability('mod/feedback:viewreports', $context);
 
-    if(has_capability('moodle/course:bulkmessaging', $coursecontext)) {
+    if($action == 'sendmessage' AND has_capability('moodle/course:bulkmessaging', $coursecontext)) {
         // require_once($CFG->dirroot.'/message/lib.php');
         $good = 1;
         if(is_array($messageuser)) {
@@ -169,11 +169,6 @@
         $sort = '';
     }
 
-    list($where, $params) = $table->get_sql_where(); //TODO: weird, $where not used anywhere
-    if ($where) {
-        $where .= ' AND';
-    }
-
     //get students in conjunction with groupmode
     if($groupmode > 0) {
         if($mygroupid > 0) {
@@ -197,7 +192,7 @@
         $pagecount = $table->get_page_size();
     }
 
-    $students = feedback_get_incomplete_users($cm, $usedgroupid, $sort, $startpage, $pagecount); // TODO: $where and $params should be probably used here
+    $students = feedback_get_incomplete_users($cm, $usedgroupid, $sort, $startpage, $pagecount);
     //####### viewreports-start
     //print the list of students
     echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthwide');