diff --git a/application/controllers/User.php b/application/controllers/User.php
index c344ca598..bc39cfe83 100644
--- a/application/controllers/User.php
+++ b/application/controllers/User.php
@@ -275,7 +275,11 @@ class User extends CI_Controller {
 			if($this->input->post('user_password', true)) {
 				$data['user_password'] = $this->input->post('user_password',true);
 			} else {
-				$data['user_password'] = $q->user_password;
+				if ($q->user_password !== '' && $q->user_password !== null) {
+					$data['user_password'] = '**********';
+				} else {
+					$data['user_password'] = '';
+				}
 			}
 
 			if($this->input->post('user_type', true)) {
@@ -341,13 +345,21 @@ class User extends CI_Controller {
 			if($this->input->post('user_clublog_password')) {
 				$data['user_clublog_password'] = $this->input->post('user_clublog_password', true);
 			} else {
-				$data['user_clublog_password'] = $q->user_clublog_password;
+				if ($q->user_clublog_password !== '' && $q->user_clublog_password !== null) {
+					$data['user_clublog_password'] = '**********';
+				} else {
+					$data['user_clublog_password'] = '';
+				}
 			}
 
 			if($this->input->post('user_lotw_password')) {
 				$data['user_lotw_password'] = $this->input->post('user_lotw_password', true);
 			} else {
-				$data['user_lotw_password'] = $q->user_lotw_password;
+				if ($q->user_lotw_password !== '' && $q->user_lotw_password !== null) {
+					$data['user_lotw_password'] = '**********';
+				} else {
+					$data['user_lotw_password'] = '';
+				}
 			}
 
 			if($this->input->post('user_eqsl_name')) {
@@ -359,7 +371,11 @@ class User extends CI_Controller {
 			if($this->input->post('user_eqsl_password')) {
 				$data['user_eqsl_password'] = $this->input->post('user_eqsl_password', true);
 			} else {
-				$data['user_eqsl_password'] = $q->user_eqsl_password;
+				if ($q->user_eqsl_password !== '' && $q->user_eqsl_password !== null) {
+					$data['user_eqsl_password'] = '**********';
+				} else {
+					$data['user_eqsl_password'] = '';
+				}
 			}
 
 			if($this->input->post('user_measurement_base')) {
diff --git a/application/views/user/edit.php b/application/views/user/edit.php
index e2647a90d..c1738e1b7 100644
--- a/application/views/user/edit.php
+++ b/application/views/user/edit.php
@@ -63,13 +63,12 @@
 									<div class="mb-3">
 										<label><?php echo lang('account_password'); ?></label>
 										<div class="input-group">
-											<input class="form-control" type="password" name="user_password" />
+											<input class="form-control" type="password" name="user_password" value="<?php if(isset($user_password)) { echo $user_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>
 										</div>
 										<?php if(isset($password_error)) {
 											echo "<small class=\"badge bg-danger\">".$password_error."</small>";
 											} else if (!isset($user_add)) { ?>
-											<small class="form-text text-muted"><?php echo lang('account_leave_blank_to_keep_existing_password'); ?></small>
 										<?php } ?>
 									</div>
 
@@ -708,13 +707,12 @@
 									<div class="mb-3">
 										<label><?php echo lang('account_logbook_of_the_world_lotw_password'); ?></label>
 										<div class="input-group">
-											<input class="form-control" type="password" name="user_lotw_password" />
+											<input class="form-control" type="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>
 										</div>
 										<?php if(isset($lotwpassword_error)) {
 											echo "<small class=\"badge bg-danger\">".$lotwpassword_error."</small>";
 											} else if (!isset($user_add)) { ?>
-												<small class="form-text text-muted"><?php echo lang('account_leave_blank_to_keep_existing_password'); ?></small>
 										<?php } ?>
 									</div>
 								</div>
@@ -735,13 +733,12 @@
 									<div class="mb-3">
 										<label><?php echo lang('account_eqslcc_password'); ?></label>
 										<div class="input-group">
-											<input class="form-control" type="password" name="user_eqsl_password" />
+											<input class="form-control" type="password" name="user_eqsl_password" value="<?php if(isset($user_eqsl_password)) { echo $user_eqsl_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>
 										</div>
 										<?php if(isset($eqslpassword_error)) {
 											echo "<small class=\"badge bg-danger\">".$eqslpassword_error."</small>";
 											} else if (!isset($user_add)) { ?>
-												<small class="form-text text-muted"><?php echo lang('account_leave_blank_to_keep_existing_password'); ?></small>
 										<?php } ?>
 									</div>
 								</div>
@@ -763,13 +760,12 @@
 									<div class="mb-3">
 										<label><?php echo lang('account_clublog_password'); ?></label>
 										<div class="input-group">
-											<input class="form-control" type="password" name="user_clublog_password" />
+											<input class="form-control" type="password" name="user_clublog_password" value="<?php if(isset($user_clublog_password)) { echo $user_clublog_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>
 										</div>
 										<?php if(isset($clublogpassword_error)) {
 											echo "<small class=\"badge bg-danger\">".$clublogpassword_error."</small>";
 											} else if (!isset($user_add)) { ?>
-												<small class="form-text text-muted"><?php echo lang('account_leave_blank_to_keep_existing_password'); ?></small>
 										<?php } ?>
 									</div>
 								</div>