diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php
index 2e94dd18..db89c906 100644
--- a/application/views/logbookadvanced/index.php
+++ b/application/views/logbookadvanced/index.php
@@ -202,8 +202,12 @@
 				<th>Name</th>
 				<th>QSL Via</th>
 				<th>QSL</th>
-				<th>LoTW</th>
-				<th>eQSL</th>
+				<?php if ($this->session->userdata('user_lotw_name') != ""){
+					echo '<th class="lotwconfirmation">LoTW</th>';
+				} ?>
+				<?php if ($this->session->userdata('user_eqsl_name') != ""){
+					echo '<th class="eqslconfirmation">eQSL</th>';
+				} ?>
 				<th>QSL Msg</th>
 				<th>DXCC</th>
 				<th>State</th>
diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js
index 96906129..9f1b4a60 100644
--- a/assets/js/sections/logbookadvanced.js
+++ b/assets/js/sections/logbookadvanced.js
@@ -27,8 +27,12 @@ function updateRow(qso) {
 	cells.eq(c++).text(qso.name);
 	cells.eq(c++).text(qso.qslVia);
 	cells.eq(c++).html(qso.qsl);
-	cells.eq(c++).html(qso.lotw);
-	cells.eq(c++).html(qso.eqsl);
+	if ($(".lotwconfirmation")[0]){
+		cells.eq(c++).html(qso.lotw);
+	}
+	if ($(".eqslconfirmation")[0]){
+		cells.eq(c++).html(qso.eqsl);
+	}
 	cells.eq(c++).text(qso.qslMessage);
 	cells.eq(c++).text(qso.dxcc);
 	cells.eq(c++).text(qso.state);
@@ -63,29 +67,32 @@ function loadQSOTable(rows) {
 	
 	for (i = 0; i < rows.length; i++) {
 		let qso = rows[i];
-		
-		var data = [
-			'<div class="form-check"><input class="form-check-input" type="checkbox" /></div>',
-			qso.qsoDateTime,
-			qso.de,
-			'<a id="edit_qso" href="javascript:displayQso('+qso.qsoID+')">'+qso.dx+'</a>',
-			qso.mode,
-			qso.rstS,
-			qso.rstR,
-			qso.band,
-			qso.deRefs,
-			qso.dxRefs,
-			qso.name,
-			qso.qslVia,
-			qso.qsl,
-			qso.lotw,
-			qso.eqsl,
-			qso.qslMessage,
-			qso.dxcc+(qso.end == null ? '' : ' <span class="badge badge-danger">Deleted DXCC</span>'),
-			qso.state,
-			qso.cqzone,
-			qso.iota,
-		];
+
+		var data = [];
+		data.push('<div class="form-check"><input class="form-check-input" type="checkbox" /></div>');
+		data.push(qso.qsoDateTime);
+		data.push(qso.de);
+		data.push('<a id="edit_qso" href="javascript:displayQso('+qso.qsoID+')">'+qso.dx+'</a>');
+		data.push(qso.mode);
+		data.push(qso.rstS);
+		data.push(qso.rstR);
+		data.push(qso.band);
+		data.push(qso.deRefs);
+		data.push(qso.dxRefs);
+		data.push(qso.name);
+		data.push(qso.qslVia);
+		data.push(qso.qsl);
+		if ($(".lotwconfirmation")[0]){
+			data.push(qso.lotw);
+		}
+		if ($(".eqslconfirmation")[0]){
+			data.push(qso.eqsl);
+		}
+		data.push(qso.qslMessage);
+		data.push(qso.dxcc+(qso.end == null ? '' : ' <span class="badge badge-danger">Deleted DXCC</span>'));
+		data.push(qso.state);
+		data.push(qso.cqzone);
+		data.push(qso.iota);
 		
 		let createdRow = table.row.add(data).index();
 		table.rows(createdRow).nodes().to$().data('qsoID', qso.qsoID);