diff --git a/app/assets/javascripts/users/registrations/edit.js b/app/assets/javascripts/users/registrations/edit.js
index 465aa97a6..ed89728cb 100644
--- a/app/assets/javascripts/users/registrations/edit.js
+++ b/app/assets/javascripts/users/registrations/edit.js
@@ -89,6 +89,7 @@
       $('#twoFactorAuthenticationModal .qr-code').html(result.qr_code);
       $('#twoFactorAuthenticationModal').find('[href="#2fa-step-1"]').tab('show');
       $('#twoFactorAuthenticationModal').modal('show');
+      $('#twoFactorAuthenticationModal').find('.submit-code-field').removeClass('error').find('#submit_code').val('');
     });
   });
 
diff --git a/app/views/users/registrations/edit_partials/_email.html.erb b/app/views/users/registrations/edit_partials/_email.html.erb
index 79c9250dd..7e7323b30 100644
--- a/app/views/users/registrations/edit_partials/_email.html.erb
+++ b/app/views/users/registrations/edit_partials/_email.html.erb
@@ -8,7 +8,7 @@
       <%= f.label t("users.registrations.edit.email_label") %>
       <div class="user-attribute">
         <%= @user.email %>
-        <a href="#" class="btn btn-default" data-action="edit"><%=t "general.edit" %></a>
+        <a href="#" class="btn btn-default" data-action="edit"><%= t("general.change") %></a>
       </div>
       <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
         <div class="alert alert-info" style="margin-top: 15px;" role="alert">
diff --git a/app/views/users/registrations/edit_partials/_password.html.erb b/app/views/users/registrations/edit_partials/_password.html.erb
index afc11def0..e99b6fa47 100644
--- a/app/views/users/registrations/edit_partials/_password.html.erb
+++ b/app/views/users/registrations/edit_partials/_password.html.erb
@@ -9,7 +9,7 @@
       <%= f.label t("users.registrations.edit.password_label") %>
       <div class="user-attribute">
         ••••••••••••
-        <a href="#" class="btn btn-default" data-action="edit"><%=t "general.edit" %></a>
+        <a href="#" class="btn btn-default" data-action="edit"><%=t("general.change") %></a>
       </div>
     </div>
   </div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 06189c22b..2dc3aeedb 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2329,6 +2329,7 @@ en:
     save: "Save"
     close: "Close"
     create: 'Create'
+    change: "Change"
     no_comments: "No comments!"
     more_comments: "More comments"
     comment_placeholder: "Your Message"