diff --git a/templates/admin.php b/templates/admin.php
index 97dd0452..10d08f3e 100644
--- a/templates/admin.php
+++ b/templates/admin.php
@@ -3,7 +3,7 @@
     <div class="panel panel-primary">
       <div class="panel-heading"><i class="fa fa-lock fa-fw"></i><?php echo _("Configure Auth"); ?></div>
       <div class="panel-body">
-        <p><?php $status->showMessages(); ?></p>
+        <?php $status->showMessages(); ?>
         <form role="form" action="?page=auth_conf" method="POST">
           <?php echo CSRFTokenFieldTag() ?>
           <div class="row">
diff --git a/templates/configure_client.php b/templates/configure_client.php
index c812d6e9..5a3a5831 100644
--- a/templates/configure_client.php
+++ b/templates/configure_client.php
@@ -4,7 +4,7 @@
       <div class="panel-heading"><i class="fa fa-signal fa-fw"></i> <?php echo _("Configure client"); ?></div>
       <!-- /.panel-heading -->
       <div class="panel-body">
-        <p><?php $status->showMessages(); ?></p>
+        <?php $status->showMessages(); ?>
         <h4><?php echo _("Client settings"); ?></h4>
 
         <div class="btn-group btn-block">
diff --git a/templates/dhcp.php b/templates/dhcp.php
index 228691e6..8dcce473 100644
--- a/templates/dhcp.php
+++ b/templates/dhcp.php
@@ -7,7 +7,7 @@
   </div>
     <!-- /.panel-heading -->
     <div class="panel-body">
-    <p><?php $status->showMessages(); ?></p>
+    <?php $status->showMessages(); ?>
     <form method="POST" action="?page=dhcpd_conf" class="js-dhcp-settings-form">
     <?php echo CSRFTokenFieldTag() ?>
     <!-- Nav tabs -->
diff --git a/templates/hostapd.php b/templates/hostapd.php
index c3060b20..bd14b2ab 100644
--- a/templates/hostapd.php
+++ b/templates/hostapd.php
@@ -7,7 +7,7 @@
     </div>
     <!-- /.panel-heading -->
     <div class="panel-body">
-  <p><?php $status->showMessages(); ?></p>
+    <?php $status->showMessages(); ?>
       <form role="form" action="?page=hostapd_conf" method="POST">
         <?php echo CSRFTokenFieldTag() ?>
         <!-- Nav tabs -->