diff --git a/mod/assignment/mod.html b/mod/assignment/mod.html
index 555cfb4af8d..e45720e0fac 100644
--- a/mod/assignment/mod.html
+++ b/mod/assignment/mod.html
@@ -32,7 +32,7 @@
     }
 ?>
 
-<form name="form" method="post" <?php echo $onsubmit ?> action="<?php echo $ME ?>">
+<form name="form" method="post" <?php echo $onsubmit ?> action="mod.php">
 <table cellpadding=5>
 <tr valign=top>
     <td align=right><p><b><?php print_string("assignmentname", "assignment") ?>:</b></p></td>
diff --git a/mod/assignment/submissions.php b/mod/assignment/submissions.php
index fc15a827395..da80c19c2ca 100644
--- a/mod/assignment/submissions.php
+++ b/mod/assignment/submissions.php
@@ -134,9 +134,9 @@
     print_simple_box_start("CENTER", "50%");
     echo "<P align=\"CENTER\">";
     print_string("order");
-    echo ": <A HREF=\"$ME?id=$assignment->id&sort=lastname&dir=ASC\">".get_string("name")."</a> - ";
-    echo "<A HREF=\"$ME?id=$assignment->id\">".get_string("lastmodified")."</a> - ";
-    echo "<A HREF=\"$ME?id=$assignment->id&sort=grade\">".get_string("feedback")."</a>";
+    echo ": <A HREF=\"submissions.php?id=$assignment->id&sort=lastname&dir=ASC\">".get_string("name")."</a> - ";
+    echo "<A HREF=\"submissions.php?id=$assignment->id\">".get_string("lastmodified")."</a> - ";
+    echo "<A HREF=\"submissions.php?id=$assignment->id&sort=grade\">".get_string("feedback")."</a>";
     echo "</P>";
     print_simple_box_end();
     print_spacer(8,1);
diff --git a/mod/choice/mod.html b/mod/choice/mod.html
index 95233e5ec9f..2db776ee343 100644
--- a/mod/choice/mod.html
+++ b/mod/choice/mod.html
@@ -39,7 +39,7 @@
     }
 
 ?>
-<form name="form" method="post" <?php echo $onsubmit ?> action="<?php echo $ME ?>">
+<form name="form" method="post" <?php echo $onsubmit ?> action="mod.php">
 
 <table cellpadding=5>
 
diff --git a/mod/forum/mod.html b/mod/forum/mod.html
index 7c9880d0c94..6df4c01afe9 100644
--- a/mod/forum/mod.html
+++ b/mod/forum/mod.html
@@ -18,7 +18,7 @@
         $form->forcesubscribe = "";
     }
 ?>
-<form name="form" method="post" action="<?php echo $ME ?>">
+<form name="form" method="post" <?php echo $onsubmit ?> action="mod.php">
 <table cellpadding=5>
 <tr>
 <tr valign=top>
diff --git a/mod/journal/mod.html b/mod/journal/mod.html
index 0aebbcf8776..56f223b69e6 100644
--- a/mod/journal/mod.html
+++ b/mod/journal/mod.html
@@ -10,7 +10,7 @@
     }
 ?>
 
-<form name="form" method="post" action="<?php echo $ME ?>">
+<form name="form" method="post" <?php echo $onsubmit ?> action="mod.php">
 <table cellpadding=5>
 <tr valign=top>
     <td align=right><p><b><?php print_string("journalname", "journal") ?>:</b></p></td>
diff --git a/mod/quiz/mod.html b/mod/quiz/mod.html
index e1759187f5a..ed6b6d72681 100644
--- a/mod/quiz/mod.html
+++ b/mod/quiz/mod.html
@@ -202,7 +202,7 @@
 <input type="hidden" name=modulename    value="<?php p($form->modulename) ?>">
 <input type="hidden" name=instance      value="<?php p($form->instance) ?>">
 <input type="hidden" name=mode          value="<?php p($form->mode) ?>">
-<input type="hidden" name=destination   value="<?php echo $ME ?>">
-<INPUT type="submit" value="<?php print_string("continue") ?>">
+<input type="hidden" name=destination   value="<?php echo "$CFG->wwwroot/course/mod.php" ?>">
+<input type="submit" value="<?php print_string("continue") ?>">
 </center>
 </form>
diff --git a/mod/resource/mod.html b/mod/resource/mod.html
index ab31e0e949e..67d60d5af50 100644
--- a/mod/resource/mod.html
+++ b/mod/resource/mod.html
@@ -68,7 +68,7 @@
 <input type="hidden" name=modulename  value="<?php p($form->modulename) ?>">
 <input type="hidden" name=instance    value="<?php p($form->instance) ?>">
 <input type="hidden" name=mode        value="<?php p($form->mode) ?>">
-<input type="hidden" name=destination value="<?php echo $ME ?>">
+<input type="hidden" name=destination   value="<?php echo "$CFG->wwwroot/course/mod.php" ?>">
 <input type="submit" value="<?php print_string("continue") ?>">
 </center>
 </form>
diff --git a/mod/survey/mod.html b/mod/survey/mod.html
index 4260d980ff9..ade46e03a77 100644
--- a/mod/survey/mod.html
+++ b/mod/survey/mod.html
@@ -37,7 +37,7 @@
 </table>
 <CENTER>
 <input type="hidden" name=intro   value="<?php p($form->intro) ?>">
-<input type="hidden" name=destination value="<?php echo $ME ?>">
+<input type="hidden" name=destination   value="<?php echo "$CFG->wwwroot/course/mod.php" ?>">
 
 <input type="hidden" name=course     value="<?php p($form->course) ?>">
 <input type="hidden" name=coursemodule  value="<?php p($form->coursemodule) ?>">
diff --git a/mod/workshop/mod.html b/mod/workshop/mod.html
index 10f3ade391f..14a82d2a249 100644
--- a/mod/workshop/mod.html
+++ b/mod/workshop/mod.html
@@ -49,7 +49,7 @@
     }
 ?>
 
-<form name="form" method="post" <?=$onsubmit ?> action="<?=$ME ?>">
+<form name="form" method="post" <?php echo $onsubmit ?> action="mod.php">
 <table cellpadding=5>
 <tr valign=top>
     <td align=right><P><B><? print_string("title", "workshop") ?>:</B></P></TD>