diff --git a/interface/web/client/templates/client_edit_address.htm b/interface/web/client/templates/client_edit_address.htm
index 23318b218b45b0b76aa32e0ecf747bbf04886569..835b2644003257b9538d7c357d11ed30309f390a 100644
--- a/interface/web/client/templates/client_edit_address.htm
+++ b/interface/web/client/templates/client_edit_address.htm
@@ -1,7 +1,7 @@
-        <legend>{tmpl_var name='Address'}</legend>
-            <div class="form-group">
+              <div class="form-group">
                 <label for="company_name" class="col-sm-3 control-label">{tmpl_var name='company_name_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="company_name" id="company_name" value="{tmpl_var name='company_name'}" class="form-control" /></div></div>
+                <div class="col-sm-9"><input type="text" name="company_name" id="company_name" value="{tmpl_var name='company_name'}" class="form-control" /></div>
+              </div>
             <div class="form-group">
                 <label for="gender" class="col-sm-3 control-label">{tmpl_var name='gender_txt'}</label>
                 <div class="col-sm-9"><select name="gender" id="gender" class="form-control">
@@ -146,7 +146,7 @@
                 </div>
             </div>
             {tmpl_var name='required_fields_txt'}
-        
+
 
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
 
diff --git a/interface/web/client/templates/client_edit_limits.htm b/interface/web/client/templates/client_edit_limits.htm
index 0508ab5090bec316646efbdcf7215925fc7e0129..db0b3708045e8a9bc03d522aa83c19b5fd256e65 100644
--- a/interface/web/client/templates/client_edit_limits.htm
+++ b/interface/web/client/templates/client_edit_limits.htm
@@ -1,7 +1,7 @@
 <div class="panel panel_client">
-    
+
 	<div class="pnl_formsarea">
-        <fieldset class="inlineLabels"><legend>{tmpl_var name="Limits"}</legend>
+        <fieldset class="inlineLabels">
                 <div class="form-group">
                     <label for="template_master" class="col-sm-3 control-label">{tmpl_var name='template_master_txt'}</label>
                     <div class="col-sm-9"><select name="template_master" id="template_master" class="form-control">
@@ -361,7 +361,7 @@
                     <label for="limit_cron_frequency" class="col-sm-3 control-label">{tmpl_var name='limit_cron_frequency_txt'}</label>
                     <div class="col-sm-9"><input type="text" name="limit_cron_frequency" id="limit_cron_frequency" value="{tmpl_var name='limit_cron_frequency'}" class="form-control" /></div>
 				</div>
-            
+
       </div>
     </div>
   </div>
diff --git a/interface/web/mail/templates/mail_domain_catchall_edit.htm b/interface/web/mail/templates/mail_domain_catchall_edit.htm
index 0ccae15a8feab950c71c71deafd1378f0f161173..8da10f1f09e00e5a8840f3c8feed993b224108d1 100644
--- a/interface/web/mail/templates/mail_domain_catchall_edit.htm
+++ b/interface/web/mail/templates/mail_domain_catchall_edit.htm
@@ -1,4 +1,4 @@
-<			<div class="form-group">
+			<div class="form-group">
                 <label for="email_domain" class="col-sm-3 control-label">{tmpl_var name='source_txt'}</label>
                 <div class="col-sm-9">
 					<div class="input-group">
@@ -22,7 +22,7 @@
                     {tmpl_var name='active'}
                 </div>
             </div>
-        
+
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
         <input type="hidden" name="type" value="catchall">
 
diff --git a/interface/web/mail/templates/mail_user_backup.htm b/interface/web/mail/templates/mail_user_backup.htm
index 0de61a3297030bdf5d8b4066eac2021544aa7831..bbf1abaf87cc59005ac27627b00c6457409f93b1 100644
--- a/interface/web/mail/templates/mail_user_backup.htm
+++ b/interface/web/mail/templates/mail_user_backup.htm
@@ -7,8 +7,6 @@
 </div>
 </tmpl_if>
 
-
-        <legend>Backup</legend>
             <div class="form-group">
                 <label for="backup_interval" class="col-sm-3 control-label">{tmpl_var name='backup_interval_txt'}</label>
                 <div class="col-sm-9"><select name="backup_interval" id="backup_interval" class="form-control">
@@ -21,7 +19,7 @@
                     {tmpl_var name='backup_copies'}
                 </select></div>
             </div>
-        
+
         {tmpl_var name='backup_records'}
         <input type="hidden" name="id" value="{tmpl_var name='id'}">