diff --git a/user/view.php b/user/view.php
index a2ef2b5f314..14a85b97920 100644
--- a/user/view.php
+++ b/user/view.php
@@ -353,6 +353,7 @@
     if ($currentuser and !isguest()) {
         if ($internalpassword ) {
             echo "<td nowrap=\"nowrap\"><form action=\"$internalpassword\" method=\"get\">";
+            echo "<fieldset>";
             echo "<input type=\"hidden\" name=\"id\" value=\"$course->id\" />";
             if (!empty($USER->realuser)) {
                 // changing of password when "Logged in as" is not allowed
@@ -360,10 +361,13 @@
             } else {
                 echo "<input type=\"submit\" value=\"".get_string("changepassword")."\" />";
             }
+            echo "</fieldset>";
             echo "</form></td>";
         } elseif ( method_exists($userauth, 'change_password_url') and strlen($userauth->change_password_url())) {
             echo "<td nowrap=\"nowrap\"><form action=\"".$userauth->change_password_url()."\" method=\"get\">";
+            echo "<fieldset>";
             echo "<input type=\"submit\" value=\"".get_string("changepassword")."\" />";
+            echo "</fieldset>";
             echo "</form></td>";
         }
     }
@@ -378,18 +382,22 @@
              get_user_roles($coursecontext, $user->id)) ) {                          // This user has roles
 
             echo '<td nowrap="nowrap"><form action="../course/unenrol.php" method="get">';
+            echo "<fieldset>";
             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 '</form></td>';
         }
     }
 
     if ($USER->id != $user->id  && has_capability('moodle/user:loginas', $coursecontext))  {
         echo '<td nowrap="nowrap"><form action="'.$CFG->wwwroot.'/course/loginas.php" method="get">';
+        echo "<fieldset>";
         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 '</form></td>';
     }
 
@@ -401,21 +409,27 @@
                 $messagebuttonname = get_string("messages", "message");
             }
             echo "<td nowrap=\"nowrap\"><form target=\"message\" action=\"../message/index.php\" method=\"get\">";
+            echo "<fieldset>";
             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 "</form></td>";
         } else {
             echo "<td nowrap=\"nowrap\"><form target=\"message_$user->id\" action=\"../message/discussion.php\" method=\"get\">";
+            echo "<fieldset>";
             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 "</form></td>";
         }
     }
     // Authorize.net: User Payments
     if ($course->enrol == 'authorize' || (empty($course->enrol) && $CFG->enrol == 'authorize')) {
         echo "<td nowrap=\"nowrap\"><form action=\"../enrol/authorize/index.php\" method=\"get\">";
+        echo "<fieldset>";
         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 "</form></td>";
     }
     echo "<td></td>";