diff --git a/application/models/User_model.php b/application/models/User_model.php
index b22ee747a..4a2842a97 100644
--- a/application/models/User_model.php
+++ b/application/models/User_model.php
@@ -688,7 +688,7 @@ class User_Model extends CI_Model {
 		$u = $this->get($username);
 		if($u->num_rows() != 0) {
 			// direct login to clubstations are not allowed
-			if ($u->row()->clubstation == 1) {
+			if ($u->row()->clubstation == 1 && !($this->config->item('club_direct') ?? false)) {
 				$uid = $u->row()->user_id;
 				log_message('debug', "User ID: [$uid] Login rejected because of a external clubstation login attempt.");
 				return 2;
diff --git a/assets/js/sections/operator.js b/assets/js/sections/operator.js
index 55e2af7b5..fa569dbe1 100644
--- a/assets/js/sections/operator.js
+++ b/assets/js/sections/operator.js
@@ -4,12 +4,6 @@ $(document).ready(function () {
 			saveOperator();
 		}
 	});
-
-	setTimeout(function () {
-        if (localStorage.getItem('operator_callsign')) {
-            $('#operator_callsign').val(localStorage.getItem('operator_callsign'));
-        }
-    }, 200);
 });
 
 function displayOperatorDialog() {
@@ -56,6 +50,4 @@ function saveOperator() {
 	} else {
 		operatorInput.addClass("is-invalid");
 	}
-
-	localStorage.setItem('operator_callsign', operatorCallsign);
 }