diff --git a/course/enrol.html b/course/enrol.html
index 9ff1ac24b0b..a9e1c74dd1f 100644
--- a/course/enrol.html
+++ b/course/enrol.html
@@ -30,7 +30,7 @@
             <td width=50%> 
               <table cellpadding=1 cellspacing=0><tr>
               <td><input type=submit value="<? print_string("login") ?>"></form></td>
-              <td><form action="<?=$CFG->wwwroot?>/" method=post>
+              <td><form action="<?=$CFG->wwwroot?>/index.php" method=post>
                   <input type=submit value="<? print_string("cancel") ?>"></form></td>
               </tr></table>
 
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 50c4c90e55a..c2084e309cc 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -31,7 +31,7 @@ function print_header ($title="", $heading="", $navigation="", $focus="", $meta=
         if (isset($USER->id)) {
             $button = "<FONT SIZE=2><A HREF=\"$CFG->wwwroot/login/logout.php\">".get_string("logout")."</A></FONT>";
         } else {
-            $button = "<FONT SIZE=2><A HREF=\"$CFG->wwwroot/login/\">".get_string("login")."</A></FONT>";
+            $button = "<FONT SIZE=2><A HREF=\"$CFG->wwwroot/login/index.php\">".get_string("login")."</A></FONT>";
         }
     }
  
@@ -76,7 +76,7 @@ function print_footer ($course=NULL) {
                       " (<A HREF=\"$CFG->wwwroot/login/logout.php\">".get_string("logout")."</A>)";
     } else { 
         $loggedinas = get_string("loggedinnot", "moodle").
-                      " (<A HREF=\"$CFG->wwwroot/login/\">".get_string("login")."</A>)";
+                      " (<A HREF=\"$CFG->wwwroot/login/index.php\">".get_string("login")."</A>)";
     } 
 
     include ("$CFG->dirroot/theme/$CFG->theme/footer.html");
@@ -971,9 +971,9 @@ function require_login($courseid=0) {
         $USER = NULL;
         save_session("USER");
         if ($PHPSESSID) { // Cookies not enabled.
-            redirect("$CFG->wwwroot/login/?PHPSESSID=$PHPSESSID");
+            redirect("$CFG->wwwroot/login/index.php?PHPSESSID=$PHPSESSID");
         } else {
-            redirect("$CFG->wwwroot/login/");
+            redirect("$CFG->wwwroot/login/index.php");
         }
         die;
     }
diff --git a/login/index_form.html b/login/index_form.html
index e8e5e8591ac..51f2f28c8f4 100644
--- a/login/index_form.html
+++ b/login/index_form.html
@@ -15,7 +15,7 @@
       (<? print_string("cookiesenabled") ?>)<BR>
 	  <? formerr($errormsg) ?>
       </p></font>
-      <FORM NAME="form" ACTION="<?=$CFG->wwwroot?>/login/" METHOD=post>
+      <FORM NAME="form" ACTION="<?=$CFG->wwwroot?>/login/index.php" METHOD=post>
         <table border="0" align="center">
         <tr>
             <td width="80%"><FONT SIZE=2>
@@ -43,7 +43,7 @@
       <HR>
         <P ALIGN=CENTER><? print_string("someallowguest") ?>:</P>
         <CENTER>
-        <FORM NAME="form2" ACTION="<?=$CFG->wwwroot?>/login/" METHOD=post>
+        <FORM NAME="form2" ACTION="<?=$CFG->wwwroot?>/login/index.php" METHOD=post>
         <INPUT TYPE="hidden" NAME="username" VALUE="guest">
         <INPUT TYPE="hidden" NAME="password" VALUE="guest">
         <INPUT type="submit" NAME="Submit"   VALUE="<? print_string("loginguest") ?>">