diff --git a/locale/en_US/LC_MESSAGES/messages.mo b/locale/en_US/LC_MESSAGES/messages.mo
index 0675c32a..34d53bd3 100644
Binary files a/locale/en_US/LC_MESSAGES/messages.mo and b/locale/en_US/LC_MESSAGES/messages.mo differ
diff --git a/locale/en_US/LC_MESSAGES/messages.po b/locale/en_US/LC_MESSAGES/messages.po
index 2573a669..8c4d5f97 100644
--- a/locale/en_US/LC_MESSAGES/messages.po
+++ b/locale/en_US/LC_MESSAGES/messages.po
@@ -353,6 +353,9 @@ msgstr "Format"
 msgid "Choose a hosted server"
 msgstr "Choose a hosted server"
 
+msgid "Enable these options to log DHCP server activity."
+msgstr "Enable these options to log DHCP server activity."
+
 msgid "Log DHCP requests"
 msgstr "Log DHCP requests"
 
@@ -468,6 +471,9 @@ msgstr "Executing RaspAP service start"
 msgid "Close"
 msgstr "Close"
 
+msgid "Enable this option to log <code>hostapd</code> activity."
+msgstr "Enable this option to log <code>hostapd</code> activity."
+
 #: includes/networking.php
 msgid "Summary"
 msgstr "Summary"
diff --git a/templates/dhcp/logging.php b/templates/dhcp/logging.php
index 2a39e236..ce451e6d 100644
--- a/templates/dhcp/logging.php
+++ b/templates/dhcp/logging.php
@@ -12,9 +12,17 @@
     <label class="custom-control-label" for="log-queries"><?php echo _("Log DNS queries") ?></label>
   </div>
 
-  <?php
-  exec('sudo chmod o+r /tmp/dnsmasq.log');
-  $log = file_get_contents('/tmp/dnsmasq.log');
-  echo '<textarea class="logoutput my-3">'.htmlspecialchars($log, ENT_QUOTES).'</textarea>';
-  ?>
+  <div class="row">
+    <div class="form-group col-md-8 mt-2">
+      <?php
+      if ($conf['log-dhcp'] == 1 || $conf['log-queries'] == 1) {
+          exec('sudo chmod o+r /tmp/dnsmasq.log');
+          $log = file_get_contents('/tmp/dnsmasq.log');
+          echo '<textarea class="logoutput">'.htmlspecialchars($log, ENT_QUOTES).'</textarea>';
+      } else {
+          echo '<textarea class="logoutput my-3"></textarea>';
+      }
+      ?>
+    </div>
+  </div>
 </div><!-- /.tab-pane -->
diff --git a/templates/hostapd/advanced.php b/templates/hostapd/advanced.php
index 0ee47899..d0559cfe 100644
--- a/templates/hostapd/advanced.php
+++ b/templates/hostapd/advanced.php
@@ -19,15 +19,6 @@
         </div>
       </div>
     </div>
-    <div class="row">
-      <div class="col-md-6 mb-2">
-        <div class="custom-control custom-switch">
-          <?php $checked = $arrHostapdConf['LogEnable'] == 1 ? 'checked="checked"' : '' ?>
-          <input class="custom-control-input" id="chxlogenable" name="logEnable" type="checkbox" value="1" <?php echo $checked ?> />
-          <label class="custom-control-label" for="chxlogenable"><?php echo _("Logfile output"); ?></label>
-        </div>
-      </div>
-    </div>
     <div class="row">
       <div class="col-md-6 mb-2">
         <div class="custom-control custom-switch">
diff --git a/templates/hostapd/logging.php b/templates/hostapd/logging.php
index 3c56e69c..fa83395b 100644
--- a/templates/hostapd/logging.php
+++ b/templates/hostapd/logging.php
@@ -1,15 +1,23 @@
 <!-- logfile output tab -->
 <div class="tab-pane fade" id="logoutput">
   <h4 class="mt-3"><?php echo _("Logging"); ?></h4>
+  <p><?php echo _("Enable this option to log <code>hostapd</code> activity.") ?></p>
+
+  <div class="custom-control custom-switch">
+    <?php $checked = $arrHostapdConf['LogEnable'] == 1 ? 'checked="checked"' : '' ?>
+    <input class="custom-control-input" id="chxlogenable" name="logEnable" type="checkbox" value="1" <?php echo $checked ?> />
+    <label class="custom-control-label" for="chxlogenable"><?php echo _("Logfile output"); ?></label>
+  </div>
+
   <div class="row">
-    <div class="form-group col-md-8">
+    <div class="form-group col-md-8 mt-2">
       <?php
       if ($arrHostapdConf['LogEnable'] == 1) {
           exec('sudo /bin/chmod o+r /tmp/hostapd.log');
           $log = file_get_contents('/tmp/hostapd.log');
-          echo '<br /><textarea class="logoutput">'.htmlspecialchars($log, ENT_QUOTES).'</textarea>';
+          echo '<textarea class="logoutput">'.htmlspecialchars($log, ENT_QUOTES).'</textarea>';
       } else {
-          echo "<br />Logfile output not enabled";
+          echo '<textarea class="logoutput my-3"></textarea>';
       }
       ?>
      </div>