diff --git a/app/controllers/verification/email_controller.rb b/app/controllers/verification/email_controller.rb
index 122d2ed84..d9172a239 100644
--- a/app/controllers/verification/email_controller.rb
+++ b/app/controllers/verification/email_controller.rb
@@ -21,7 +21,11 @@ class Verification::EmailController < ApplicationController
     @email = Verification::Email.new(@verified_user)
     if @email.save
       current_user.reload
-      Mailer.email_verification(current_user, @email.recipient, @email.encrypted_token).deliver_later
+      Mailer.email_verification(current_user,
+                                @email.recipient,
+                                @email.encrypted_token,
+                                @verified_user.document_type,
+                                @verified_user.document_number).deliver_later
       redirect_to account_path, notice: t('verification.email.create.flash.success', email: @verified_user.email)
     else
       redirect_to verified_user_path, alert: t('verification.email.create.alert.failure')
diff --git a/spec/factories.rb b/spec/factories.rb
index 5558bf949..6b665e884 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -1,8 +1,11 @@
 FactoryGirl.define do
 
+  sequence(:document_number) { |n| "#{n.to_s.rjust(8, '0')}X" }
+
   factory :user do
     sequence(:username) { |n| "Manuela#{n}" }
     sequence(:email)    { |n| "manuela#{n}@madrid.es" }
+
     password            'judgmentday'
     terms_of_service     '1'
     confirmed_at        { Time.now }
@@ -19,13 +22,13 @@ FactoryGirl.define do
       confirmed_phone "611111111"
       sms_confirmation_code "1234"
       document_type "1"
-      document_number "12345678Z"
+      document_number
     end
 
     trait :level_three do
       verified_at Time.now
       document_type "1"
-      document_number "12345678Z"
+      document_number
     end
 
     trait :hidden do
@@ -51,8 +54,8 @@ FactoryGirl.define do
 
   factory :verification_residence, class: Verification::Residence do
     user
-    document_number  '12345678Z'
-    document_type    1
+    document_number
+    document_type    "1"
     date_of_birth    Date.new(1980, 12, 31)
     postal_code      "28013"
     terms_of_service '1'
@@ -64,7 +67,7 @@ FactoryGirl.define do
 
   factory :failed_census_call do
     user
-    document_number '11111111A'
+    document_number
     document_type 1
     date_of_birth Date.new(1900, 1, 1)
     postal_code '28000'
@@ -85,7 +88,7 @@ FactoryGirl.define do
   end
 
   factory :verified_user do
-    document_number  '12345678Z'
+    document_number
     document_type    'dni'
   end
 
diff --git a/spec/features/admin/verifications_spec.rb b/spec/features/admin/verifications_spec.rb
index f21fb1607..975d5c3e2 100644
--- a/spec/features/admin/verifications_spec.rb
+++ b/spec/features/admin/verifications_spec.rb
@@ -44,7 +44,7 @@ feature 'Incomplete verifications' do
 
     within "#user_#{incompletely_verified_user.id}" do
       expect(page).to have_content "Spanish ID"
-      expect(page).to have_content "11111111A"
+      expect(page).to have_content incompletely_verified_user.document_number
       expect(page).to have_content Date.new(1900, 1, 1)
       expect(page).to have_content "28000"
     end
diff --git a/spec/models/residence_spec.rb b/spec/models/residence_spec.rb
index 53e8c44e6..5396aacd3 100644
--- a/spec/models/residence_spec.rb
+++ b/spec/models/residence_spec.rb
@@ -2,7 +2,7 @@ require 'rails_helper'
 
 describe Verification::Residence do
 
-  let(:residence) { build(:verification_residence) }
+  let(:residence) { build(:verification_residence, document_number: "12345678Z") }
 
   describe "validations" do
 
@@ -57,7 +57,7 @@ describe Verification::Residence do
       residence.user = user
       residence.save
 
-      residence2 = build(:verification_residence)
+      build(:verification_residence)
 
       residence.valid?
       expect(residence.errors[:document_number]).to include("has already been taken")
@@ -112,7 +112,7 @@ describe Verification::Residence do
 
   describe "Failed census call" do
     it "stores failed census API calls" do
-      residence = build(:verification_residence, :invalid)
+      residence = build(:verification_residence, :invalid, document_number: "12345678Z")
       residence.save
 
       expect(FailedCensusCall.count).to eq(1)
@@ -126,4 +126,4 @@ describe Verification::Residence do
     end
   end
 
-end
\ No newline at end of file
+end