diff --git a/login/index.php b/login/index.php
index 35041250f1c..32fa626bab9 100644
--- a/login/index.php
+++ b/login/index.php
@@ -199,12 +199,12 @@ if ($authsequence[0] == 'cas' and !empty($CFG->cas_enabled)) {
             if (method_exists($userauth, 'password_expire') and !empty($userauth->config->expiration) and $userauth->config->expiration == 1) {
                     $days2expire = $userauth->password_expire($USER->username);
                     if (intval($days2expire) > 0 && intval($days2expire) < intval($CFG->{$USER->auth.'_expiration_warning'})) {
-                        print_header("$site->fullname: $loginsite", "$site->fullname", $loginsite, $focus, "", true, "<div align=\"right\">$langmenu</div>"); 
+                        print_header("$site->fullname: $loginsite", "$site->fullname", $loginsite, $focus, "", true, "<div style=\"text-align:right\">$langmenu</div>"); 
                         notice_yesno(get_string('auth_passwordwillexpire', 'auth', $days2expire), $passwordchangeurl, $urltogo); 
                         print_footer();
                         exit;
                     } elseif (intval($days2expire) < 0 ) {
-                        print_header("$site->fullname: $loginsite", "$site->fullname", $loginsite, $focus, "", true, "<div align=\"right\">$langmenu</div>"); 
+                        print_header("$site->fullname: $loginsite", "$site->fullname", $loginsite, $focus, "", true, "<div style=\"text-align:right\">$langmenu</div>"); 
                         notice_yesno(get_string('auth_passwordisexpired', 'auth'), $passwordchangeurl, $urltogo);
                         print_footer();
                         exit;
@@ -281,7 +281,7 @@ if ($authsequence[0] == "email" or $authsequence[0] == "none" or !empty($CFG->au
     }
 
     print_header("$site->fullname: $loginsite", $site->fullname, $loginsite, $focus, 
-                 '', true, '<div class="langmenu" align="right">'.$langmenu.'</div>'); 
+                 '', true, '<div class="langmenu" style="text-align:right">'.$langmenu.'</div>'); 
 
     include("index_form.html");
 
diff --git a/login/index_form.html b/login/index_form.html
index 971d0634521..afec42af64a 100644
--- a/login/index_form.html
+++ b/login/index_form.html
@@ -86,7 +86,7 @@
               case "email":
                  print_string("loginsteps", "", "signup.php");
 ?>
-                 <div align="center">
+                 <div style="text-align:center">
                    <form action="signup.php" method="get" id="signup">
                    <div><input type="submit" value="<?php print_string("startsignup") ?>" /></div>
                    </form>
@@ -105,9 +105,9 @@
                  $authplugin = get_auth_plugin($CFG->auth);
                  if (!empty($CFG->auth_user_create) and method_exists($authplugin, 'user_create') ){
 ?>
-                 <div align="center">
+                 <div style="text-align:center">
                     <form action="signup.php" method="get" id="signup">
-                    <input type="submit" value="<?php print_string("startsignup") ?>" />
+                    <div><input type="submit" value="<?php print_string("startsignup") ?>" /></div>
                     </form>
                  </div>
 <?php            }
@@ -117,3 +117,4 @@
 <?php } ?>
 </tr>
 </table>
+</div>
\ No newline at end of file