diff --git a/user/index.php b/user/index.php
index 889b327d5ea..dfe8368b14d 100644
--- a/user/index.php
+++ b/user/index.php
@@ -619,8 +619,8 @@
     }
 
     if ($bulkoperations && $totalcount > ($perpage*3)) {
-        echo '<form action="index.php"><fieldset class="invisiblefieldset"><input type="hidden" name="id" value="'.$course->id.'" />'.get_string('search').':&nbsp;'."\n";
-        echo '<input type="text" name="search" value="'.$search.'" />&nbsp;<input type="submit" value="'.get_string('search').'" /></fieldset></form>'."\n";
+        echo '<form action="index.php"><div><input type="hidden" name="id" value="'.$course->id.'" />'.get_string('search').':&nbsp;'."\n";
+        echo '<input type="text" name="search" value="'.$search.'" />&nbsp;<input type="submit" value="'.get_string('search').'" /></div></form>'."\n";
     }
 
     if ($perpage == SHOW_ALL_PAGE_SIZE) {
diff --git a/user/view.php b/user/view.php
index cb5680f7e4f..101c2b990ce 100644
--- a/user/view.php
+++ b/user/view.php
@@ -364,7 +364,7 @@
 
     if ($currentuser and $passwordchangeurl and !isguest()) { //TODO: add proper capability for password changing
         echo "<form action=\"$passwordchangeurl\" method=\"get\">";
-        echo "<fieldset class='invisiblefieldset'>";
+        echo "<div>";
         echo "<input type=\"hidden\" name=\"id\" value=\"$course->id\" />";
         if (!empty($USER->realuser)) {
             // changing of password when "Logged in as" is not allowed
@@ -372,7 +372,7 @@
         } else {
             echo "<input type=\"submit\" value=\"".get_string("changepassword")."\" />";
         }
-        echo "</fieldset>";
+        echo "</div>";
         echo "</form>";
     }
 
@@ -386,11 +386,11 @@
              get_user_roles($coursecontext, $user->id)) ) {                          // This user has roles
 
             echo '<form action="../course/unenrol.php" method="get">';
-            echo "<fieldset class='invisiblefieldset'>";
+            echo "<div>";
             echo '<input type="hidden" name="id" value="'.$course->id.'" />';
             echo '<input type="hidden" name="user" value="'.$user->id.'" />';
             echo '<input type="submit" value="'.get_string('unenrolme', '', $course->shortname).'" />';
-            echo "</fieldset>";
+            echo "</div>";
             echo '</form>';
         }
     }
@@ -398,11 +398,11 @@
     if ($USER->id != $user->id  && has_capability('moodle/user:loginas', $coursecontext) &&
                                  ! has_capability('moodle/site:doanything', $coursecontext, $user->id, false)) {
         echo '<form action="'.$CFG->wwwroot.'/course/loginas.php" method="get">';
-        echo "<fieldset class='invisiblefieldset'>";
+        echo "<div>";
         echo '<input type="hidden" name="id" value="'.$course->id.'" />';
         echo '<input type="hidden" name="user" value="'.$user->id.'" />';
         echo '<input type="submit" value="'.get_string('loginas').'" />';
-        echo "</fieldset>";
+        echo "</div>";
         echo '</form>';
     }
 
@@ -414,27 +414,27 @@
                 $messagebuttonname = get_string("messages", "message");
             }
             echo "<form onclick=\"this.target='message'\" action=\"../message/index.php\" method=\"get\">";
-            echo "<fieldset class='invisiblefieldset'>";
+            echo "<div>";
             echo "<input type=\"submit\" value=\"$messagebuttonname\" onclick=\"return openpopup('/message/index.php', 'message', 'menubar=0,location=0,scrollbars,status,resizable,width=400,height=500', 0);\" />";
-            echo "</fieldset>";
+            echo "</div>";
             echo "</form>";
         } else {
             echo "<form onclick=\"this.target='message$user->id'\" action=\"../message/discussion.php\" method=\"get\">";
-            echo "<fieldset class='invisiblefieldset'>";
+            echo "<div>";
             echo "<input type=\"hidden\" name=\"id\" value=\"$user->id\" />";
             echo "<input type=\"submit\" value=\"".get_string("sendmessage", "message")."\" onclick=\"return openpopup('/message/discussion.php?id=$user->id', 'message_$user->id', 'menubar=0,location=0,scrollbars,status,resizable,width=400,height=500', 0);\" />";
-            echo "</fieldset>";
+            echo "</div>";
             echo "</form>";
         }
     }
     // Authorize.net: User Payments
     if ($course->enrol == 'authorize' || (empty($course->enrol) && $CFG->enrol == 'authorize')) {
         echo "<form action=\"../enrol/authorize/index.php\" method=\"get\">";
-        echo "<fieldset class='invisiblefieldset'>";
+        echo "<div>";
         echo "<input type=\"hidden\" name=\"course\" value=\"$course->id\" />";
         echo "<input type=\"hidden\" name=\"user\" value=\"$user->id\" />";
         echo "<input type=\"submit\" value=\"".get_string('payments')."\" />";
-        echo "</fieldset>";
+        echo "</div>";
         echo "</form>";
     }
     echo "</div>\n";