diff --git a/app/assets/javascripts/sitewide/show_password.js b/app/assets/javascripts/sitewide/show_password.js
index f152e5182..eb44099e1 100644
--- a/app/assets/javascripts/sitewide/show_password.js
+++ b/app/assets/javascripts/sitewide/show_password.js
@@ -1,4 +1,5 @@
-$(document).on('turbolinks:load', function() {
+function initShowPassword() {
+  $('.fas.fa-eye.show-password').remove();
   $.each($('input[type="password"]'), function(i, e) {
     $(`<i class="fas fa-eye show-password"
           style="
@@ -8,6 +9,10 @@ $(document).on('turbolinks:load', function() {
           "></i>`).insertAfter(e);
     $(e).parent().addClass('right-icon');
   });
+}
+
+$(document).on('turbolinks:load', function() {
+  initShowPassword()
 });
 
 $(document).on('click', '.show-password', function() {
diff --git a/app/assets/javascripts/users/registrations/edit.js b/app/assets/javascripts/users/registrations/edit.js
index cd2a5d551..33441df69 100644
--- a/app/assets/javascripts/users/registrations/edit.js
+++ b/app/assets/javascripts/users/registrations/edit.js
@@ -8,7 +8,7 @@
    * false to set form to view mode.
    */
 
-  /* global _ filesValidator animateSpinner FileTypeEnum */
+  /* global _ filesValidator animateSpinner FileTypeEnum initShowPassword */
 
   var forms = $('form[data-for]');
 
@@ -18,6 +18,7 @@
       form.find("[data-part='view']").hide();
       form.find("[data-part='edit']").show();
       form.find("[data-part='edit'] input:not([type='file']):not([type='submit']):first").focus();
+      initShowPassword();
     } else {
       form.find("[data-part='view']").show();
       form.find("[data-part='edit'] input").blur();