diff --git a/mod/assign/lib.php b/mod/assign/lib.php
index 932f2a3ec72..ae7bab01f8e 100644
--- a/mod/assign/lib.php
+++ b/mod/assign/lib.php
@@ -77,18 +77,18 @@ function assign_reset_userdata($data) {
             $status = array_merge($status, $assignment->reset_userdata($data));
         }
     }
-        // Updating dates - shift may be negative too.
-        $componentstr = get_string('modulenameplural', 'assign');
+    // Updating dates - shift may be negative too.
+    $componentstr = get_string('modulenameplural', 'assign');
 
-        if ($data->timeshift) {
-            shift_course_mod_dates('assign',
-                                    array('duedate', 'allowsubmissionsfromdate', 'cutoffdate'),
-                                    $data->timeshift,
-                                    $data->courseid);
-            $status[] = array('component' => $componentstr,
-                              'item' => get_string('datechanged'),
-                              'error' => false);
-        }
+    if ($data->timeshift) {
+        shift_course_mod_dates('assign',
+                                array('duedate', 'allowsubmissionsfromdate', 'cutoffdate'),
+                                $data->timeshift,
+                                $data->courseid);
+        $status[] = array('component' => $componentstr,
+                          'item' => get_string('datechanged'),
+                          'error' => false);
+    }
     return $status;
 }
 
diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php
index 1e0970acf21..fe3136d982d 100644
--- a/mod/assign/locallib.php
+++ b/mod/assign/locallib.php
@@ -618,16 +618,6 @@ class assign {
                 assign_reset_gradebook($data->courseid);
             }
         }
-        // Updating dates - shift may be negative too.
-        if ($data->timeshift) {
-            shift_course_mod_dates('assign',
-                                    array('duedate', 'allowsubmissionsfromdate','cutoffdate'),
-                                    $data->timeshift,
-                                    $data->courseid);
-            $status[] = array('component'=>$componentstr,
-                              'item'=>get_string('datechanged'),
-                              'error'=>false);
-        }
 
         return $status;
     }
diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index d3c27c704a1..68c01e2350b 100644
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -2369,13 +2369,6 @@ class assignment_base {
                 assignment_reset_gradebook($data->courseid, $this->type);
             }
         }
-
-        /// updating dates - shift may be negative too
-        if ($data->timeshift) {
-            shift_course_mod_dates('assignment', array('timedue', 'timeavailable'), $data->timeshift, $data->courseid);
-            $status[] = array('component'=>$componentstr, 'item'=>get_string('datechanged').': '.$typestr, 'error'=>false);
-        }
-
         return $status;
     }
 
@@ -3888,6 +3881,22 @@ function assignment_reset_userdata($data) {
         $status = array_merge($status, $ass->reset_userdata($data));
     }
 
+    // Updating dates - shift may be negative too.
+    if ($data->timeshift) {
+        $plugintypestrkey = 'type'.$this->type;
+        if (get_string_manager()->string_exists($plugintypestrkey, 'assignment')) {
+            $typestr = get_string_manager()->get_string($plugintypestrkey, 'assignment');
+        } else {
+            $typestr = get_string_manager()->get_string($plugintypestrkey, 'assignment_'.$this->type);
+        }
+        shift_course_mod_dates('assignment',
+                                array('timedue', 'timeavailable'),
+                                $data->timeshift,
+                                $data->courseid);
+        $status[] = array('component' => get_string('modulenameplural', 'assignment'),
+                          'item' => get_string('datechanged').': '.$typestr,
+                          'error' => false);
+    }
     return $status;
 }