diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index 538a5595c0e..3f75283ad76 100644
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -655,7 +655,6 @@ class assignment_base {
         } else {
             $currentgroup = false;
         }
-        $limit = ' '.sql_paging_limit($offset+1, 1);
 
     /// Get all teachers and students
         if ($currentgroup) {
@@ -669,6 +668,14 @@ class assignment_base {
         $sql = 'FROM '.$CFG->prefix.'user u '.
                'LEFT JOIN '.$CFG->prefix.'assignment_submissions s ON u.id = s.userid AND s.assignment = '.$this->assignment->id.' '.
                'WHERE u.id IN ('.implode(',', array_keys($users)).') ';
+               
+        require_once($CFG->libdir.'/tablelib.php');
+        if($sort = flexible_table::get_sql_sort('mod-assignment-submissions')) {
+            $sort = 'ORDER BY '.$sort.' ';
+        }
+
+        $limit = sql_paging_limit($offset+1, 1);
+
         $nextid = 0;
         if (($auser = get_record_sql($select.$sql.$sort.$limit)) !== false) {
             $nextid = $auser->id;
@@ -919,7 +926,6 @@ class assignment_base {
             $limit = '';
         }
     
-        $ssort = "$sort";//sorting order to allow replication of SQL statement
         ///offset used to calculate index of student in that particular query, needed for the pop up to know who's next
         $offset = $page * $perpage;