diff --git a/interface/web/client/templates/client_edit_limits.htm b/interface/web/client/templates/client_edit_limits.htm
index 66db76bbc622ca313f85bd278940af6d6b83a496..f5c49b601487b051d864f8d909a709efdd9f444b 100644
--- a/interface/web/client/templates/client_edit_limits.htm
+++ b/interface/web/client/templates/client_edit_limits.htm
@@ -45,7 +45,7 @@
                 </div>
                 <div class="form-group">
                     <label for="reseller" class="col-sm-3 control-label">{tmpl_var name='reseller_txt'}</label>
-                    <div class="col-sm-9"><input class="form-control" type="checkbox" name="reseller" value="1" id="reseller" /></div>
+                    <div class="col-sm-9"><input type="checkbox" name="reseller" value="1" id="reseller" /></div>
 				</div>
                 </tmpl_if>
 <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
@@ -175,10 +175,11 @@
       </h4>
     </div>
     <div id="collapseMail" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingMail>
-      <div class="panel-body">&nbsp;
+      <div class="panel-body">
 				<div class="form-group">
                     <label for="mail_servers" class="col-sm-3 control-label">{tmpl_var name='mail_servers_txt'}</label>
-                    <div class="col-sm-9"><select data-placeholder="{tmpl_var name='mail_servers_placeholder'}" multiple name="mail_servers[]" id="mail_servers" class="form-control">
+                    <div class="col-sm-9">
+						<select data-placeholder="{tmpl_var name='mail_servers_placeholder'}" multiple name="mail_servers[]" id="mail_servers" class="form-control">
                         {tmpl_var name='mail_servers'}
                     </select></div>
                 </div>
diff --git a/interface/web/dns/templates/dns_slave_edit.htm b/interface/web/dns/templates/dns_slave_edit.htm
index 598fe95b71145744491b885f524a9443c51d7d3e..832fec1abc0445f73aceb06073a05184406c7601 100644
--- a/interface/web/dns/templates/dns_slave_edit.htm
+++ b/interface/web/dns/templates/dns_slave_edit.htm
@@ -46,12 +46,18 @@
                         {tmpl_var name='domain_option'}
                     </select></div>
                     <tmpl_else>
-                        <div class="col-sm-9"><input type="text" name="origin" id="origin" value="{tmpl_var name='origin'}" class="form-control" /></div></tmpl_if>
-                <p class="formHint">{tmpl_var name='eg_domain_tld'}</p>
+                        <div class="col-sm-9">
+							<input type="text" name="origin" id="origin" value="{tmpl_var name='origin'}" class="form-control" />
+							<p class="formHint">{tmpl_var name='eg_domain_tld'}</p>
+						</div></tmpl_if>
+                
             </div>
             <div class="form-group">
                 <label for="ns" class="col-sm-3 control-label">{tmpl_var name='ns_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="ns" id="ns" value="{tmpl_var name='ns'}" class="form-control" /></div><p class="formHint">{tmpl_var name='ipv4_form_txt'}</p>
+                <div class="col-sm-9">
+					<input type="text" name="ns" id="ns" value="{tmpl_var name='ns'}" class="form-control" />
+					<p class="formHint">{tmpl_var name='ipv4_form_txt'}</p>
+				</div>
             </div>
             <div class="form-group">
                 <label for="xfer" class="col-sm-3 control-label">{tmpl_var name='xfer_txt'}</label>