diff --git a/resources/templates/adduser.tmpl b/resources/templates/adduser.tmpl
index ab31d42..060cf4a 100644
--- a/resources/templates/adduser.tmpl
+++ b/resources/templates/adduser.tmpl
@@ -6,10 +6,14 @@
         <div class="col-md-12 column">
             <div class="well well-sm">
               <form method='POST' action='/adduser' role="form" class="form-signin" data-toggle="validator">
-              <h2 class="h3">Fill new user's attributes:</h2>
+              <fieldset>
+              <legend>Fill new user's attributes:</legend>
               ${form}
-              <h2 class="h3">Enable/Disable user's roles:</h2>
+              </fieldset>
+              <fieldset>
+              <legend>Enable/Disable user's roles:</legend>
               ${roles}
+              </fieldset>
               <div class="form-group">
                 <div class="input-group">
                   <button class="btn btn-default green" type="submit">
diff --git a/resources/templates/modify.tmpl b/resources/templates/modify.tmpl
index c2840ff..b87f209 100644
--- a/resources/templates/modify.tmpl
+++ b/resources/templates/modify.tmpl
@@ -6,12 +6,17 @@
         <div class="col-md-12 column">
             <div class="well well-sm">
               <form method='POST' action='/modify' role="form" class="form-signin" data-toggle="validator">
-              <h2 class="h3">Modify user's attributes:</h2>
+              <fieldset>
+              <legend>Modify user's attributes:</legend>
               ${form}
-              <h2 class="h3">Enable/Disable user's roles:</h2>
+              </fieldset>
+              <fieldset>
+              <legend>Enable/Disable user's roles:</legend>
               ${roles}
+              </fieldset>
               % if len(standalone_groups) != 0:
-              <h2 class="h3">Delete user's individual groups:</h2>
+              <fieldset>
+              <legend>Delete user's individual groups:</legend>
               <table id="RecordTable" class="table table-hover table-condensed tablesorter">
               <thead>
               <tr>
@@ -47,6 +52,7 @@
               % endfor
               </tbody>
               </table>
+              </fieldset>
               % endif
               <div class="form-group">
                 <div class="input-group">
diff --git a/resources/templates/selfmodify.tmpl b/resources/templates/selfmodify.tmpl
index 28e4ac2..a2fb285 100644
--- a/resources/templates/selfmodify.tmpl
+++ b/resources/templates/selfmodify.tmpl
@@ -6,8 +6,9 @@
         <div class="col-md-12 column">
             <div class="well well-sm">
               <form method='POST' action='/selfmodify' role="form" class="form-signin" data-toggle="validator">
-              <h2 class="h3">Modify your attributes:</h2>
+              <legend>Modify your attributes:</legend>
               ${form}
+              </fieldset>
               <div class="form-group">
                 <div class="input-group">
                     <button type="submit" class="btn btn-default blue">