diff --git a/admin/index.php b/admin/index.php
index 1ae53ec18bf..cf744deb00a 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -143,10 +143,10 @@
             print_header($strcurrentrelease, $strcurrentrelease, $strcurrentrelease, "", "", false, " ", " ");
             print_heading("Moodle $release");
             print_box(get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/en/Release_Notes'));
-            echo '<form action="index.php"><fieldset class="invisiblefieldset">';
+            echo '<form action="index.php"><div>';
             echo '<input type="hidden" name="agreelicense" value="1" />';
             echo '<input type="hidden" name="confirmrelease" value="1" />';
-            echo '</fieldset>';
+            echo '</div>';
             echo '<div class="continuebutton"><input name="autopilot" id="autopilot" type="checkbox" value="1" /><label for="autopilot">'.get_string('unattendedoperation', 'admin').'</label>';
             echo '<br /><br /><input type="submit" value="'.get_string('continue').'" /></div>';
             echo '</form>';
@@ -280,10 +280,10 @@
                 } else {
                     notify(get_string('environmentok', 'admin'), 'notifysuccess');
 
-                    echo '<form action="index.php"><fieldset class="invisiblefieldset">';
+                    echo '<form action="index.php"><div>';
                     echo '<input type="hidden" name="confirmupgrade" value="1" />';
                     echo '<input type="hidden" name="confirmrelease" value="1" />';
-                    echo '</fieldset>';
+                    echo '</div>';
                     echo '<div class="continuebutton"><input name="autopilot" id="autopilot" type="checkbox" value="0" /><label for="autopilot">'.get_string('unattendedoperation', 'admin').'</label>';
                     echo '<br /><br /><input type="submit" value="'.get_string('continue').'" /></div>';
                     echo '</form>';
diff --git a/admin/lang.php b/admin/lang.php
index ec0084674ee..0da78a41451 100644
--- a/admin/lang.php
+++ b/admin/lang.php
@@ -57,17 +57,17 @@
             $navigation = "<a href=\"lang.php\">$strlanguage</a> -> $strmissingstrings";
             $title = $strmissingstrings;
             $button = '<form '.$CFG->frametarget.' method="get" action="'.$CFG->wwwroot.'/'.$CFG->admin.'/lang.php">'.
-                      '<fieldset class="invisiblefieldset">'.
+                      '<div>'.
                       '<input type="hidden" name="mode" value="compare" />'.
-                      '<input type="submit" value="'.$streditstrings.'" /></fieldset></form>';
+                      '<input type="submit" value="'.$streditstrings.'" /></div></form>';
             break;
         case "compare":
             $navigation = "<a href=\"lang.php\">$strlanguage</a> -> $streditstrings";
             $title = $streditstrings;
             $button = '<form  '.$CFG->frametarget.' method="get" action="'.$CFG->wwwroot.'/'.$CFG->admin.'/lang.php">'.
-                      '<fieldset class="invisiblefieldset">'.
+                      '<div>'.
                       '<input type="hidden" name="mode" value="missing" />'.
-                      '<input type="submit" value="'.$strmissingstrings.'" /></fieldset></form>';
+                      '<input type="submit" value="'.$strmissingstrings.'" /></div></form>';
             break;
         default:
             $title = $strlanguage;
@@ -299,12 +299,12 @@
         helpbutton('langswitchstorage', $strfilestoredinhelp, 'moodle');
         
         echo '<form '.$CFG->frametarget.' method="get" action="'.$CFG->wwwroot.'/'.$CFG->admin.'/lang.php">'.
-             '<fieldset class="invisiblefieldset">'.
+             '<div>'.
              '<input type="hidden" name="mode" value="compare" />'.
              '<input type="hidden" name="currentfile" value="'.$currentfile.'" />'.
              '<input type="hidden" name="uselocal" value="'.(1 - $uselocal % 2).'" />'.
              '<input type="submit" value="'.$strswitchlang.'" />'.
-             '</fieldset></form>';
+             '</div></form>';
         print_box_end();
        
         if ($currentfile <> '') {