diff --git a/application/views/search/result_search.php b/application/views/search/result_search.php
index 58a3332e..be398cf8 100644
--- a/application/views/search/result_search.php
+++ b/application/views/search/result_search.php
@@ -1,5 +1,4 @@
-
-	<div class="table-responsive">
+<div class="table-responsive">
 	<table class="table table-striped table-hover">
 		<tr class="titles">
 			<td>Date</td>
diff --git a/application/views/view_log/partial/log.php b/application/views/view_log/partial/log.php
index c7c60bcf..5940f84d 100644
--- a/application/views/view_log/partial/log.php
+++ b/application/views/view_log/partial/log.php
@@ -114,13 +114,11 @@
 			</td>
 			<?php } ?>
 
-			<?php if($this->config->item('callsign_tags') == true) { ?>
 				<?php if(isset($row->station_callsign)) { ?>
 				<td>
 					<span class="badge badge-light"><?php echo $row->station_callsign; ?></span>
 				</td>
 				<?php } ?>
-			<?php } ?>
 
 			<td>
 				<div class="dropdown">
diff --git a/application/views/view_log/partial/log_ajax.php b/application/views/view_log/partial/log_ajax.php
index e5473e1d..0ec354f3 100644
--- a/application/views/view_log/partial/log_ajax.php
+++ b/application/views/view_log/partial/log_ajax.php
@@ -19,7 +19,9 @@
                 <?php if($this->session->userdata('user_lotw_name') != "") { ?>
                     <td>LoTW</td>
                 <?php } ?>
+            <?php } ?>
                 <td><?php echo $this->lang->line('gen_hamradio_station'); ?></td>
+            <?php if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>
                 <td></td>
             <?php } ?>
         </tr>
@@ -113,15 +115,16 @@
                         <?php } ?>
                     </td>
                 <?php } ?>
-
-                <?php if($this->config->item('callsign_tags') == true) { ?>
+            
+            <?php } ?>
+            
                     <?php if(isset($row->station_callsign)) { ?>
                         <td>
                             <span class="badge badge-light"><?php echo $row->station_callsign; ?></span>
                         </td>
                     <?php } ?>
-                <?php } ?>
-
+            
+            <?php if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>
                 <td>
                     <div class="dropdown">
                         <a class="btn btn-secondary dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">