diff --git a/login/index_form.html b/login/index_form.html
index 379e1c1b9ce..07cff3b609e 100644
--- a/login/index_form.html
+++ b/login/index_form.html
@@ -5,11 +5,9 @@ if ($show_instructions) {
     $columns = 'onecolumn';
 }
 ?>
-<div class="loginbox"><div class="<?php echo $columns ?>">
-  <div class="content">
+<div class="loginbox clearfix <?php echo $columns ?>">
     <div class="loginpanel">
-     <div class="divider">
-      <div class="header"><h2><?php print_string("returningtosite") ?></h2></div>
+      <h2><?php print_string("returningtosite") ?></h2>
       <div class="subcontent loginsub">
         <div class="desc">
           <?php
@@ -74,10 +72,9 @@ if ($show_instructions) {
         </form>
       </div>
      </div>
-    </div>
 <?php if ($show_instructions) { ?>
     <div class="signuppanel">
-      <div class="header"><h2><?php print_string("firsttime") ?></h2></div>
+      <h2><?php print_string("firsttime") ?></h2>
       <div class="subcontent">
 <?php     switch ($authsequence[0]) {
               case "email":
@@ -113,6 +110,4 @@ if ($show_instructions) {
       </div>
     </div>
 <?php } ?>
-    <div class="clearer"><!-- --></div>
-  </div>
-</div></div>
+</div>