diff --git a/application/controllers/Lotw.php b/application/controllers/Lotw.php
index 6f8f774b7..1078b8e8f 100644
--- a/application/controllers/Lotw.php
+++ b/application/controllers/Lotw.php
@@ -731,47 +731,74 @@ class Lotw extends CI_Controller {
 			exit();
 		}
 		$ret=[];
+		$ret['status']='';
 
-		$this->load->model('logbook_model');
-		$query = $this->user_model->get_by_id($this->session->userdata('user_id'));
-		$q = $query->row();
-		$data['user_lotw_name'] = urlencode($q->user_lotw_name ?? '');
-		$data['user_lotw_password'] = urlencode($q->user_lotw_password ?? '');
 
-		// Get URL for downloading LoTW
-		$query = $query = $this->db->query('SELECT lotw_login_url FROM config');
-		$q = $query->row();
-		$lotw_url = $q->lotw_login_url;
+		$raw = file_get_contents("php://input");
+		try {
+			$obj = json_decode($raw,true);
+		} catch (e) {
+			$ret['status']='failed_wrongcall';
+			log_message("Error",$ret['status']);
+		} finally {
+			$lotw_user=$obj['lotw_user'] ?? '';
+			$lotw_pass=$obj['lotw_pass'] ?? '';
+		}
+		$raw='';
 
-		// Validate that LoTW credentials are not empty
-		// TODO: We don't actually see the error message
-		if ($data['user_lotw_name'] == '' || $data['user_lotw_password'] == '') {
-			$ret='No Creds set';
+		$pw_placeholder = '**********';
+		if ($lotw_pass == $pw_placeholder) {	// User comes with unaltered credentials - take them from database
+			$query = $this->user_model->get_by_id($this->session->userdata('user_id'));
+			$q = $query->row();
+			$data['user_lotw_name'] = urlencode($q->user_lotw_name ?? '');
+			$data['user_lotw_password'] = urlencode($q->user_lotw_password ?? '');
+		} else {
+			$data['user_lotw_name'] = urlencode($lotw_user ?? '');
+			$data['user_lotw_password'] = urlencode($lotw_pass ?? '');
 		}
 
-		// Build URL for LoTW report file
-		$lotw_url .= "?";
-		$lotw_url .= "login=" . $data['user_lotw_name'];
-		$lotw_url .= "&password=" . $data['user_lotw_password'];
+		if ((($data['user_lotw_name'] ?? '') != '') && (($data['user_lotw_password'] ?? '') != '') && ($ret['status'] != 'failed_wrongcall')) {
 
-		$ch = curl_init();
-		curl_setopt($ch, CURLOPT_URL, $lotw_url);
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 30);
-		$content = curl_exec($ch);
-		if ($content) {
-			if(curl_errno($ch)) {
-				$ret['status']='failed';
-				$ret['details']== __("LoTW check failed for user ").$data['user_lotw_name'].": ".curl_strerror(curl_errno($ch))." (".curl_errno($ch).").";
-			} else if (str_contains($content,"Username/password incorrect</I>")) {
-				$ret['status']='failed_wrong_creds';
-				$ret['details']= __("LoTW check failed for user ").$data['user_lotw_name'].__(": Username/password incorrect");
+			// Get URL for downloading LoTW
+			$query = $query = $this->db->query('SELECT lotw_login_url FROM config');
+			$q = $query->row();
+			$lotw_url = $q->lotw_login_url;
+
+			// Validate that LoTW credentials are not empty
+			// TODO: We don't actually see the error message
+			if ($data['user_lotw_name'] == '' || $data['user_lotw_password'] == '') {
+				$ret='No Creds set';
+			}
+
+			// Build URL for LoTW report file
+			$lotw_url .= "?";
+			$lotw_url .= "login=" . $data['user_lotw_name'];
+			$lotw_url .= "&password=" . $data['user_lotw_password'];
+
+			$ch = curl_init();
+			curl_setopt($ch, CURLOPT_URL, $lotw_url);
+			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 30);
+			$content = curl_exec($ch);
+			if ($content) {
+				if(curl_errno($ch)) {
+					$ret['status']='failed';
+					$ret['details']== __("LoTW check failed for user ").$data['user_lotw_name'].": ".curl_strerror(curl_errno($ch))." (".curl_errno($ch).").";
+				} else if (str_contains($content,"Username/password incorrect</I>")) {
+					$ret['status']='failed_wrong_creds';
+					$ret['details']= __("LoTW check failed for user ").$data['user_lotw_name'].__(": Username/password incorrect");
+				} else {
+					$ret['status']='OK';
+				}
 			} else {
-				$ret['status']='OK';
+				$ret['status']='failed_na';
+				$ret['details']= __("LoTW not available at present");
 			}
 		} else {
-			$ret['status']='failed_na';
-			$ret['details']= __("LoTW not available at present");
+			if (($ret['status'] ?? '') == '') {
+				$ret['status']='failed_nocred';
+				$ret['details']= __("No LoTW credentials provided");
+			}
 		}
 		header("Content-type: application/json");
 		echo json_encode($ret);
diff --git a/application/views/user/edit.php b/application/views/user/edit.php
index c5e28b548..d25993e4d 100644
--- a/application/views/user/edit.php
+++ b/application/views/user/edit.php
@@ -706,15 +706,16 @@
 								<div class="card-body">
 									<div class="mb-3">
 										<label><?= __("Logbook of The World (LoTW) Username"); ?></label>
-										<input class="form-control" type="text" name="user_lotw_name" value="<?php if(isset($user_lotw_name)) { echo $user_lotw_name; } ?>" />
+										<input class="form-control" type="text" name="user_lotw_name" id="user_lotw_name" value="<?php if(isset($user_lotw_name)) { echo $user_lotw_name; } ?>" />
 										<?php if(isset($userlotwname_error)) { echo "<small class=\"badge bg-danger\">".$userlotwname_error."</small>"; } ?>
 									</div>
 
 									<div class="mb-3">
 										<label><?= __("Logbook of The World (LoTW) Password"); ?></label>
 										<div class="input-group">
-											<input class="form-control" type="password" name="user_lotw_password" value="<?php if(isset($user_lotw_password)) { echo $user_lotw_password; } ?>" />
+											<input class="form-control" type="password" id="user_lotw_password" name="user_lotw_password" value="<?php if(isset($user_lotw_password)) { echo $user_lotw_password; } ?>" />
 											<span class="input-group-btn"><button class="btn btn-default btn-pwd-showhide" type="button"><i class="fa fa-eye-slash"></i></button></span>
+											<button class="btn btn-secondary" type="button" id="lotw_test_btn">Test LoTW</button>
 										</div>
 										<?php if(isset($lotwpassword_error)) {
 											echo "<small class=\"badge bg-danger\">".$lotwpassword_error."</small>";