diff --git a/app/controllers/verification/email_controller.rb b/app/controllers/verification/email_controller.rb
index 017269095..122d2ed84 100644
--- a/app/controllers/verification/email_controller.rb
+++ b/app/controllers/verification/email_controller.rb
@@ -6,7 +6,11 @@ class Verification::EmailController < ApplicationController
 
   def show
     if Verification::Email.find(current_user, params[:email_verification_token])
-      current_user.update(verified_at: Time.now)
+
+      current_user.update(verified_at: Time.now,
+                          document_number: current_user.document_number || current_user.unconfirmed_document_number,
+                          residence_verified_at: current_user.residence_verified_at || Time.now)
+
       redirect_to account_path, notice: t('verification.email.show.flash.success')
     else
       redirect_to verified_user_path, alert: t('verification.email.show.alert.failure')
@@ -33,4 +37,4 @@ class Verification::EmailController < ApplicationController
     def verified_user_params
       params.require(:verified_user).permit(:id)
     end
-end
\ No newline at end of file
+end
diff --git a/app/models/verification/management/email.rb b/app/models/verification/management/email.rb
index 37d37be90..7cd815dd5 100644
--- a/app/models/verification/management/email.rb
+++ b/app/models/verification/management/email.rb
@@ -21,7 +21,11 @@ class Verification::Management::Email
     return false unless valid?
 
     plain_token, encrypted_token = Devise.token_generator.generate(User, :email_verification_token)
-    user.update(email_verification_token: plain_token)
+
+    user.update(document_type: document_type,
+                unconfirmed_document_number: document_number,
+                email_verification_token: plain_token)
+
     Mailer.email_verification(user, email, encrypted_token, document_type, document_number).deliver_later
     true
   end