diff --git a/blocks/login/block_login.php b/blocks/login/block_login.php
index 45c956089c5..4c140af426e 100644
--- a/blocks/login/block_login.php
+++ b/blocks/login/block_login.php
@@ -48,17 +48,16 @@ class block_login extends block_base {
         $this->content->text = '';
 
         if (empty($USER->loggedin) or isguest()) {   // Show the block
-///            $this->content->text .= '<style> .loginform div { margin:0.4em 0.4em; text-align:right; } .loginform input { width: 6em; } .r2 input { text-align:center; } </style>'; //DONOTCOMMIT:TODO
 
             $this->content->text .= "\n".'<form class="loginform" name="login" method="post" action="'.$wwwroot.'/login/index.php">';
 
-            $this->content->text .= '<div class="r0"><label for="login_username">'.get_string('username').'</label>: ';
+            $this->content->text .= '<div class="c1"><label for="login_username">'.get_string('username').'</label>: ';
             $this->content->text .= '<input type="text" name="username" id="login_username" value="'.$username.'" /></div>';
 
-            $this->content->text .= '<div class="r1"><label for="login_password">'.get_string('password').'</label>: ';
+            $this->content->text .= '<div class="c1"><label for="login_password">'.get_string('password').'</label>: ';
             $this->content->text .= '<input type="password" name="password" id="login_password" value="" /></div>';
 
-            $this->content->text .= '<div class="r2"><input type="submit" value="'.get_string('login').'" /></div>';
+            $this->content->text .= '<div class="c1 btn"><input type="submit" value="'.get_string('login').'" /></div>';
 
             $this->content->text .= "</form>\n";
 
diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index be5a96ba0ce..c0458268866 100644
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -1344,6 +1344,13 @@ body#grade-index .grades .weighted {
   width: 6em;
 }
 
+.block_login .loginform div {
+  margin:0.3em 0.8em;
+  text-align:right;
+}
+.block_login .btn input {
+  text-align:center;
+}
 
 /***
  *** Message