diff --git a/app/models/verification/residence.rb b/app/models/verification/residence.rb
index 3ba773e9a..1e2d7778c 100644
--- a/app/models/verification/residence.rb
+++ b/app/models/verification/residence.rb
@@ -19,6 +19,7 @@ class Verification::Residence
     self.date_of_birth = parse_date('date_of_birth', attrs)
     attrs = remove_date('date_of_birth', attrs)
     super
+    self.document_number.upcase! unless self.document_number.blank?
   end
 
   def save
diff --git a/app/models/verified_user.rb b/app/models/verified_user.rb
index 2113ef238..b0c5afd0c 100644
--- a/app/models/verified_user.rb
+++ b/app/models/verified_user.rb
@@ -1,6 +1,5 @@
 class VerifiedUser < ActiveRecord::Base
-  scope :by_user,  -> (user)  { where(document_number: user.document_number,
-                                      document_type:   user.document_type) }
+  scope :by_user,  -> (user)  { where(document_number: user.document_number) }
 
   scope :by_email, -> (email) { where(email: email) }
   scope :by_phone, -> (phone) { where(phone: phone) }
diff --git a/spec/features/verification/verified_user_spec.rb b/spec/features/verification/verified_user_spec.rb
index c0989e180..0a74a7798 100644
--- a/spec/features/verification/verified_user_spec.rb
+++ b/spec/features/verification/verified_user_spec.rb
@@ -5,22 +5,18 @@ feature 'Verified users' do
   scenario "Verified emails" do
     user = create(:user,
                   residence_verified_at: Time.now,
-                  document_number:       '12345678Z',
-                  document_type:         '2')
+                  document_number:       '12345678Z')
 
     create(:verified_user,
            document_number: '12345678Z',
-           document_type:   '2',
            email:           'rock@example.com')
 
     create(:verified_user,
             document_number: '12345678Z',
-            document_type:   '2',
             email:           'roll@example.com')
 
     create(:verified_user,
             document_number: '99999999R',
-            document_type:   '2',
             email:           'another@example.com')
 
     login_as(user)
@@ -33,22 +29,18 @@ feature 'Verified users' do
   scenario "Verified phones" do
     user = create(:user,
                   residence_verified_at: Time.now,
-                  document_number:       '12345678Z',
-                  document_type:         '2')
+                  document_number:       '12345678Z')
 
     create(:verified_user,
            document_number: '12345678Z',
-           document_type:   '2',
            phone:           '611111111')
 
     create(:verified_user,
             document_number: '12345678Z',
-            document_type:   '2',
             phone:           '622222222')
 
     create(:verified_user,
             document_number: '99999999R',
-            document_type:   '2',
             phone:           '633333333')
 
     login_as(user)
@@ -61,12 +53,10 @@ feature 'Verified users' do
   scenario "Select a verified email" do
     user = create(:user,
               residence_verified_at: Time.now,
-              document_number:       '12345678Z',
-              document_type:         '2')
+              document_number:       '12345678Z')
 
     verified_user = create(:verified_user,
                            document_number: '12345678Z',
-                           document_type:   '2',
                            email:           'rock@example.com')
 
     login_as(user)
@@ -83,12 +73,10 @@ feature 'Verified users' do
   scenario "Select a verified phone" do
     user = create(:user,
                   residence_verified_at: Time.now,
-                  document_number:       '12345678Z',
-                  document_type:         '2')
+                  document_number:       '12345678Z')
 
     verified_user = create(:verified_user,
                            document_number: '12345678Z',
-                           document_type:   '2',
                            phone:           '611111111')
 
     login_as(user)
@@ -104,12 +92,10 @@ feature 'Verified users' do
   scenario "Continue without selecting any verified information" do
     user = create(:user,
                   residence_verified_at: Time.now,
-                  document_number:       '12345678Z',
-                  document_type:         '2')
+                  document_number:       '12345678Z')
 
     create(:verified_user,
            document_number: '12345678Z',
-           document_type:   '2',
            phone:           '611111111')
 
     login_as(user)
diff --git a/spec/models/residence_spec.rb b/spec/models/residence_spec.rb
index 481940ec4..14892ea5d 100644
--- a/spec/models/residence_spec.rb
+++ b/spec/models/residence_spec.rb
@@ -40,6 +40,13 @@ describe Verification::Residence do
     end
   end
 
+  describe "new" do
+    it "should upcase document number" do
+      residence = Verification::Residence.new({document_number: "x1234567z"})
+      expect(residence.document_number).to eq("X1234567Z")
+    end
+  end
+
   describe "save" do
 
     it "should store document number and type" do