diff --git a/app/controllers/officing/base_controller.rb b/app/controllers/officing/base_controller.rb
index 271f62daa..97ef23d30 100644
--- a/app/controllers/officing/base_controller.rb
+++ b/app/controllers/officing/base_controller.rb
@@ -7,6 +7,6 @@ class Officing::BaseController < ApplicationController
   skip_authorization_check
 
   def verify_officer
-      raise CanCan::AccessDenied unless current_user.try(:poll_officer?) || current_user.try(:administrator?)
-    end
+    raise CanCan::AccessDenied unless current_user.try(:poll_officer?) || current_user.try(:administrator?)
+  end
 end
\ No newline at end of file
diff --git a/app/controllers/officing/residence_controller.rb b/app/controllers/officing/residence_controller.rb
new file mode 100644
index 000000000..768bac21f
--- /dev/null
+++ b/app/controllers/officing/residence_controller.rb
@@ -0,0 +1,21 @@
+class Officing::ResidenceController < Officing::BaseController
+
+  def new
+    @residence = Officing::Residence.new
+  end
+
+  def create
+    @residence = Officing::Residence.new(residence_params)
+    if @residence.save
+      redirect_to new_officing_voter_path(id: @residence.user.id), notice: t("officing.residence.flash.create")
+    else
+      render :new
+    end
+  end
+
+  private
+
+    def residence_params
+      params.require(:residence).permit(:document_number, :document_type, :date_of_birth)
+    end
+end
\ No newline at end of file
diff --git a/app/controllers/officing/voters_controller.rb b/app/controllers/officing/voters_controller.rb
index 6cf321beb..bb16a1412 100644
--- a/app/controllers/officing/voters_controller.rb
+++ b/app/controllers/officing/voters_controller.rb
@@ -1,6 +1,25 @@
 class Officing::VotersController < Officing::BaseController
+  respond_to :html, :js
 
   def new
+    @user = User.find(params[:id])
+    @polls = Poll.current # fix and use answerable_by(@user)
   end
 
+  def create
+    @poll = Poll.find(voter_params[:poll_id])
+    @user = User.find(voter_params[:user_id])
+    @voter = Poll::Voter.new(document_type:   @user.document_type,
+                             document_number: @user.document_number,
+                             user: @user,
+                             poll: @poll)
+    @voter.save!
+  end
+
+  private
+
+    def voter_params
+      params.require(:voter).permit(:poll_id, :user_id)
+    end
+
 end
\ No newline at end of file
diff --git a/app/models/officing/residence.rb b/app/models/officing/residence.rb
new file mode 100644
index 000000000..2a8cca51d
--- /dev/null
+++ b/app/models/officing/residence.rb
@@ -0,0 +1,107 @@
+class Officing::Residence
+  include ActiveModel::Model
+  include ActiveModel::Dates
+  include ActiveModel::Validations::Callbacks
+
+  attr_accessor :user, :officer, :document_number, :document_type, :date_of_birth
+
+  before_validation :call_census_api
+
+  validates_presence_of :document_number
+  validates_presence_of :document_type
+  validates_presence_of :date_of_birth
+
+  validate :allowed_age
+  validate :residence_in_madrid
+
+  def initialize(attrs={})
+    self.date_of_birth = parse_date('date_of_birth', attrs)
+    attrs = remove_date('date_of_birth', attrs)
+    super
+    clean_document_number
+  end
+
+  def save
+    return false unless valid?
+
+    if user_exists?
+      self.user = find_user_by_document
+    else
+      user_params = {
+        document_number:       document_number,
+        document_type:         document_type,
+        geozone:               self.geozone,
+        date_of_birth:         date_of_birth.to_datetime,
+        gender:                gender,
+        residence_verified_at: Time.current,
+        verified_at:           Time.current,
+        erased_at:             Time.current,
+        password:              random_password,
+        terms_of_service:      '1',
+        email:                 nil
+      }
+      self.user = User.create!(user_params)
+    end
+  end
+
+  def user_exists?
+    find_user_by_document.present?
+  end
+
+  def find_user_by_document
+    User.where(document_number: document_number,
+               document_type:   document_type).first
+  end
+
+   def residence_in_madrid
+    return if errors.any?
+
+    unless residency_valid?
+      errors.add(:residence_in_madrid, false)
+    end
+  end
+
+  def allowed_age
+    return if errors[:date_of_birth].any?
+
+    unless allowed_age?
+      errors.add(:date_of_birth, I18n.t('verification.residence.new.error_not_allowed_age'))
+    end
+  end
+
+  def allowed_age?
+    self.date_of_birth <= User.minimum_required_age.years.ago
+  end
+
+  def geozone
+    Geozone.where(census_code: district_code).first
+  end
+
+  def district_code
+    @census_api_response.district_code
+  end
+
+  def gender
+    @census_api_response.gender
+  end
+
+  private
+
+    def call_census_api
+      @census_api_response = CensusApi.new.call(document_type, document_number)
+    end
+
+    def residency_valid?
+      @census_api_response.valid? &&
+      @census_api_response.date_of_birth == date_of_birth
+    end
+
+    def clean_document_number
+      self.document_number = self.document_number.gsub(/[^a-z0-9]+/i, "").upcase unless self.document_number.blank?
+    end
+
+    def random_password
+      (0...20).map { ('a'..'z').to_a[rand(26)] }.join
+    end
+
+end
diff --git a/app/models/poll.rb b/app/models/poll.rb
index c5da9dcd0..761a4561f 100644
--- a/app/models/poll.rb
+++ b/app/models/poll.rb
@@ -44,6 +44,10 @@ class Poll < ActiveRecord::Base
     current.joins(:geozones).where('geozone_restricted = ? or geozones.id = ?', false, user.geozone_id)
   end
 
+  def votable_by?(user)
+    !document_has_voted?(user.document_number, user.document_type)
+  end
+
   def document_has_voted?(document_number, document_type)
     voters.where(document_number: document_number, document_type: document_type).exists?
   end
diff --git a/app/models/poll/answer.rb b/app/models/poll/answer.rb
index 84359e330..52fb11469 100644
--- a/app/models/poll/answer.rb
+++ b/app/models/poll/answer.rb
@@ -14,6 +14,6 @@ class Poll::Answer < ActiveRecord::Base
   scope :by_question, -> (question_id) { where(question_id: question_id) }
 
   def record_voter_participation
-    Poll::Voter.create_from_user(author, {poll_id: poll_id})
+    Poll::Voter.create!(user: author, poll: poll)
   end
 end
\ No newline at end of file
diff --git a/app/models/poll/voter.rb b/app/models/poll/voter.rb
index 087771a02..1cb8083c2 100644
--- a/app/models/poll/voter.rb
+++ b/app/models/poll/voter.rb
@@ -1,45 +1,54 @@
 class Poll
   class Voter < ActiveRecord::Base
     belongs_to :poll
+    belongs_to :user
+    belongs_to :geozone
     belongs_to :booth_assignment
     belongs_to :officer_assignment
 
-    validates :poll, presence: true
+    validates :poll_id, presence: true
+    validates :user_id, presence: true
+    validates :geozone_id, presence: true
+    validates :gender, presence: true
+    validates :age, presence: true
+
     validates :document_number, presence: true, uniqueness: { scope: [:poll_id, :document_type], message: :has_voted }
 
-    def census_api_response
-      @census_api_response ||= CensusApi.new.call(document_type, document_number)
+    before_validation :set_demographic_info, :set_document_info
+
+    def set_demographic_info
+      return unless user.present?
+
+      self.gender  = user.gender
+      self.age     = user.age
+      self.geozone = user.geozone
     end
 
-    def in_census?
-      census_api_response.valid?
-    end
+    def set_document_info
+      return unless user.present?
 
-    def fill_stats_fields
-      if in_census?
-        self.gender = census_api_response.gender
-        self.geozone_id = Geozone.select(:id).where(census_code: census_api_response.district_code).first.try(:id)
-        self.age = voter_age(census_api_response.date_of_birth)
-      end
-    end
-
-    def self.create_from_user(user, options = {})
-      poll_id = options[:poll_id]
-      booth_assignment_id = options[:booth_assignment_id]
-
-      Voter.create(
-        document_type: user.document_type,
-        document_number: user.document_number,
-        poll_id: poll_id,
-        booth_assignment_id: booth_assignment_id,
-        gender: user.gender,
-        geozone_id: user.geozone_id,
-        age: user.age
-      )
+      self.document_type   = user.document_type
+      self.document_number = user.document_number
     end
 
     private
 
+      def in_census?
+        census_api_response.valid?
+      end
+
+      def census_api_response
+        @census_api_response ||= CensusApi.new.call(document_type, document_number)
+      end
+
+      def fill_stats_fields
+        if in_census?
+          self.gender = census_api_response.gender
+          self.geozone_id = Geozone.select(:id).where(census_code: census_api_response.district_code).first.try(:id)
+          self.age = voter_age(census_api_response.date_of_birth)
+        end
+      end
+
       def voter_age(dob)
         if dob.blank?
           nil
diff --git a/app/views/officing/_menu.html.erb b/app/views/officing/_menu.html.erb
index d999fc06b..40484a90a 100644
--- a/app/views/officing/_menu.html.erb
+++ b/app/views/officing/_menu.html.erb
@@ -2,7 +2,7 @@
   <ul id="officing_menu">
 
     <li <%= "class=active" if controller_name == "voters" %>>
-      <%= link_to new_officing_poll_voter_path(Poll.last) do %>
+      <%= link_to new_officing_residence_path do %>
         <span class="icon-user"></span>
         <%= t("officing.menu.voters") %>
       <% end %>
diff --git a/app/views/officing/residence/_errors.html.erb b/app/views/officing/residence/_errors.html.erb
new file mode 100644
index 000000000..4f8895a35
--- /dev/null
+++ b/app/views/officing/residence/_errors.html.erb
@@ -0,0 +1,14 @@
+<% if @residence.errors[:residence_in_madrid].present? %>
+
+  <div id="error_explanation" data-alert class="callout alert" data-closable>
+    <button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
+      <span aria-hidden="true">&times;</span>
+    </button>
+    <%= t("officing.residence.new.error_verifying_census") %>
+  </div>
+
+<% else %>
+  <%= render "shared/errors",
+             resource: @residence,
+             message: t("officing.residence.new.form_errors")  %>
+<% end %>
diff --git a/app/views/officing/residence/new.html.erb b/app/views/officing/residence/new.html.erb
new file mode 100644
index 000000000..45290762e
--- /dev/null
+++ b/app/views/officing/residence/new.html.erb
@@ -0,0 +1,26 @@
+<h2><%= t("officing.residence.new.title") %></h2>
+
+<div class="row">
+  <div class="small-12 medium-6 column">
+    <%= form_for @residence, as: "residence", url: officing_residence_path do |f| %>
+      <%= render "errors" %>
+
+      <%= f.label t("officing.residence.new.document_type_label") %>
+      <%= f.select :document_type, document_types, prompt: "", label: false %>
+
+
+      <%= f.text_field :document_number,
+                       placeholder: t("officing.residence.new.document_number") %>
+
+      <div class="date-of-birth small-12 medium-6 clear">
+      <%= f.label t("verification.residence.new.date_of_birth") %>
+      <%= f.date_select :date_of_birth,
+                        prompt: true,
+                        start_year: 1900, end_year: 16.years.ago.year,
+                        label: false %>
+      </div>
+
+      <input type="submit" value="<%= t("officing.residence.new.submit") %>" class="button">
+    <% end %>
+  </div>
+</div>
diff --git a/app/views/officing/voters/_already_voted.html.erb b/app/views/officing/voters/_already_voted.html.erb
new file mode 100644
index 000000000..847d8b7d7
--- /dev/null
+++ b/app/views/officing/voters/_already_voted.html.erb
@@ -0,0 +1,3 @@
+<div class="callout warning">
+  <%= t("officing.voters.show.error_already_voted") %>
+</div>
\ No newline at end of file
diff --git a/app/views/officing/voters/_can_vote.html.erb b/app/views/officing/voters/_can_vote.html.erb
new file mode 100644
index 000000000..66a9a5e62
--- /dev/null
+++ b/app/views/officing/voters/_can_vote.html.erb
@@ -0,0 +1,7 @@
+<div class="small-12 medium-6 large-4">
+  <%= form_for @user, as: :voter, url: officing_voters_path, method: :post, remote: true do |f| %>
+    <%= f.hidden_field :poll_id, value: poll.id %>
+    <%= f.hidden_field :user_id, value: @user.id %>
+    <%= f.submit t("officing.voters.show.submit"), class: "button success expanded" %>
+  <% end %>
+</div>
\ No newline at end of file
diff --git a/app/views/officing/voters/_voted.html.erb b/app/views/officing/voters/_voted.html.erb
new file mode 100644
index 000000000..f2c6547cf
--- /dev/null
+++ b/app/views/officing/voters/_voted.html.erb
@@ -0,0 +1,3 @@
+<div class="callout success">
+  <%= t("officing.voters.show.success") %>
+</div>
\ No newline at end of file
diff --git a/app/views/officing/voters/create.js.erb b/app/views/officing/voters/create.js.erb
new file mode 100644
index 000000000..ee280faa2
--- /dev/null
+++ b/app/views/officing/voters/create.js.erb
@@ -0,0 +1 @@
+$("#<%= dom_id(@poll) %> #actions").html('<%= j render("voted") %>');
\ No newline at end of file
diff --git a/app/views/officing/voters/new.html.erb b/app/views/officing/voters/new.html.erb
index 2042f7acb..8fdeb512a 100644
--- a/app/views/officing/voters/new.html.erb
+++ b/app/views/officing/voters/new.html.erb
@@ -1,20 +1,15 @@
 <h2><%= t("officing.voters.new.title") %></h2>
 
-<div class="row">
-  <div class="small-12 medium-6 column">
-    <form>
+<% @polls.each do |poll| %>
+  <div id="<%= dom_id(poll) %>">
+    <div><%= poll.name %></div>
 
-      <label><%= t("officing.voters.new.document_type_label") %></label>
-      <select>
-        <option><%= t("officing.voters.new.document_type.spanish_id") %></option>
-        <option><%= t("officing.voters.new.document_type.residence_card") %></option>
-        <option><%= t("officing.voters.new.document_type.passport") %></option>
-      </select>
-
-      <label><%= t("officing.voters.new.document_number") %></label>
-      <input type="text" placeholder="<%= t("officing.voters.new.document_number") %>">
-
-      <input type="submit" value="<%= t("officing.voters.new.submit") %>" class="button">
-    </form>
+    <div id="actions">
+      <% if poll.votable_by?(@user) %>
+        <%= render "can_vote", poll: poll %>
+      <% else %>
+        <%= render "already_voted" %>
+      <% end %>
+    </div>
   </div>
-</div>
+<% end %>
\ No newline at end of file
diff --git a/app/views/officing/voters/show.html.erb b/app/views/officing/voters/show.html.erb
deleted file mode 100644
index 523e0e0d4..000000000
--- a/app/views/officing/voters/show.html.erb
+++ /dev/null
@@ -1,30 +0,0 @@
-<h2><%= t("officing.voters.show.title") %></h2>
-
-<!-- IF CAN'T VOTE -->
-
-<div class="callout alert">
-  <%= t("officing.voters.show.error_verifying_census") %>
-</div>
-
-<!-- IF ALREADY VOTED -->
-
-<div class="callout warning">
-  <%= t("officing.voters.show.error_already_voted") %>
-</div>
-
-<!-- IF CAN VOTE -->
-
-<div class="callout success">
-  <%= t("officing.voters.show.can_participate") %>
-</div>
-
-<div class="small-12 medium-6 large-4">
-  <form>
-    <input type="submit" value="<%= t("officing.voters.show.submit") %>" class="button success expanded">
-  </form>
-</div>
-
-
-<div class="callout success">
-  <%= t("officing.voters.show.success") %>
-</div>
\ No newline at end of file
diff --git a/config/locales/officing.en.yml b/config/locales/officing.en.yml
index fad63ee4e..54ac52edf 100644
--- a/config/locales/officing.en.yml
+++ b/config/locales/officing.en.yml
@@ -29,20 +29,20 @@ en:
         recount_list: "Your recounts"
         booth: "Booth"
         date: "Date"
-    voters:
+    residence:
+      flash:
+        create: "Document verified with Census"
       new:
         title: Validate document
         document_number: Document number
-        document_type:
-          passport: Passport
-          residence_card: Residence card
-          spanish_id: DNI
         document_type_label: Document type
         submit: Validate document
+        error_verifying_census: "The Census was unable to verify this document."
+        form_errors: prevented the verification of this document
+    voters:
+      new:
+        title: Polls
       show:
-        title: Validate document
-        error_verifying_census: "The Census was unable to verify the information of this document."
-        error_already_voted: "The person associated with the document has already participated in the vote."
-        can_participate: "The person associated with the document can participate in the vote."
+        error_already_voted: Has already participated in this poll
         submit: Validate vote
-        success: "Vote validated correctly."
+        success: Vote validated successfully.
diff --git a/config/locales/officing.es.yml b/config/locales/officing.es.yml
index 1a8bccb13..0aa1b419c 100644
--- a/config/locales/officing.es.yml
+++ b/config/locales/officing.es.yml
@@ -29,20 +29,20 @@ es:
         recount_list: "Tus recuentos"
         booth: "Urna"
         date: "Fecha"
-    voters:
+    residence:
+      flash:
+        create: "Documento verificado con el Padrón"
       new:
         title: Validar documento
         document_number: Número de documento
-        document_type:
-          passport: Pasaporte
-          residence_card: Tarjeta de residencia
-          spanish_id: DNI
         document_type_label: Tipo de documento
         submit: Validar documento
+        error_verifying_census: El Padrón no pudo verificar este documento.
+        form_errors: evitaron verificar este documento
+    voters:
+      new:
+        title: Votaciones
       show:
-        title: Validar documento
-        error_verifying_census: "El Padrón no pudo verificar la información de este documento."
-        error_already_voted: "La persona asociada al documento ya ha participado en la votación."
-        can_participate: "La persona asociada al documento puede participar en la votación."
+        error_already_voted: "Ya ha participado en la votación."
         submit: Validar voto
-        success: "Voto validado correctamente."
+        success: Voto validado correctamente.
diff --git a/config/routes.rb b/config/routes.rb
index 5bfdf8ee9..2a0a157c2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -333,8 +333,9 @@ Rails.application.routes.draw do
   namespace :officing do
     resources :polls, only: [:index] do
       resources :recounts, only: [:new, :create]
-      resources :voters, only: [:new, :show]
     end
+    resource :residence, controller: "residence", only: [:new, :create]
+    resources :voters, only: [:new, :create]
     root to: "dashboard#index"
   end
 
diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb
index c0183d2fc..bc92f2c8b 100644
--- a/db/dev_seeds.rb
+++ b/db/dev_seeds.rb
@@ -46,6 +46,7 @@ puts " ✅"
 print "Creating Geozones"
 
 Geozone.create(name: "city")
+Geozone.create(name: "Existent District", census_code: "01")
 ('A'..'Z').each { |i| Geozone.create(name: "District #{i}", external_code: i.ord, census_code: i.ord) }
 
 puts " ✅"
@@ -595,4 +596,13 @@ print "Commenting Poll Questions"
 end
 
 puts " ✅"
-puts "All dev seeds created successfuly 👍"
\ No newline at end of file
+print "Creating Poll Voters"
+
+(1..10).each do
+  poll = Poll.all.sample
+  document_number = Faker::Number.number(10)
+  Poll::Voter.create!(poll: poll, document_number: document_number)
+end
+
+puts " ✅"
+puts "All dev seeds created successfuly 👍"
diff --git a/db/migrate/20170128214244_adds_user_id_to_poll_voters.rb b/db/migrate/20170128214244_adds_user_id_to_poll_voters.rb
new file mode 100644
index 000000000..edf635cfc
--- /dev/null
+++ b/db/migrate/20170128214244_adds_user_id_to_poll_voters.rb
@@ -0,0 +1,5 @@
+class AddsUserIdToPollVoters < ActiveRecord::Migration
+  def change
+    add_reference :poll_voters, :user, index: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index b1b45d475..020308da6 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170127173553) do
+ActiveRecord::Schema.define(version: 20170128214244) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -469,12 +469,14 @@ ActiveRecord::Schema.define(version: 20170127173553) do
     t.string   "gender"
     t.integer  "geozone_id"
     t.integer  "answer_id"
+    t.integer  "user_id"
     t.integer  "officer_assignment_id"
   end
 
   add_index "poll_voters", ["document_number"], name: "index_poll_voters_on_document_number", using: :btree
   add_index "poll_voters", ["poll_id", "document_number", "document_type"], name: "doc_by_poll", using: :btree
   add_index "poll_voters", ["poll_id"], name: "index_poll_voters_on_poll_id", using: :btree
+  add_index "poll_voters", ["user_id"], name: "index_poll_voters_on_user_id", using: :btree
 
   create_table "polls", force: :cascade do |t|
     t.string   "name"
diff --git a/spec/factories.rb b/spec/factories.rb
index 7653f9a3a..dc3b4ff58 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -22,6 +22,9 @@ FactoryGirl.define do
       sms_confirmation_code "1234"
       document_type "1"
       document_number
+      date_of_birth Date.new(1980, 12, 31)
+      gender "female"
+      geozone
     end
 
     trait :level_three do
@@ -37,6 +40,7 @@ FactoryGirl.define do
     trait :with_confirmed_hide do
       confirmed_hide_at Time.current
     end
+
   end
 
   factory :identity do
@@ -422,6 +426,7 @@ FactoryGirl.define do
 
   factory :poll_voter, class: 'Poll::Voter' do
     poll
+    association :user, :level_two
 
     trait :from_booth do
       association :booth_assignment, factory: :poll_booth_assignment
@@ -440,7 +445,7 @@ FactoryGirl.define do
 
   factory :poll_answer, class: 'Poll::Answer' do
     association :question, factory: :poll_question
-    association :author, factory: [:user, :level_three]
+    association :author, factory: [:user, :level_two]
     answer { question.valid_answers.sample }
   end
 
@@ -451,6 +456,13 @@ FactoryGirl.define do
     answer { question.valid_answers.sample }
   end
 
+  factory :officing_residence, class: 'Officing::Residence' do
+    user
+    document_number
+    document_type    "1"
+    date_of_birth    Date.new(1980, 12, 31)
+  end
+
   factory :organization do
     user
     responsible_name "Johnny Utah"
@@ -507,6 +519,10 @@ FactoryGirl.define do
     sequence(:name) { |n| "District #{n}" }
     sequence(:external_code) { |n| "#{n}" }
     sequence(:census_code) { |n| "#{n}" }
+
+    trait :in_census do
+      census_code "01"
+    end
   end
 
   factory :banner do
diff --git a/spec/features/moderation/comments_spec.rb b/spec/features/moderation/comments_spec.rb
index dc3604c3a..65d2481ba 100644
--- a/spec/features/moderation/comments_spec.rb
+++ b/spec/features/moderation/comments_spec.rb
@@ -84,6 +84,8 @@ feature 'Moderate comments' do
       end
 
       scenario "select all/none", :js do
+        Capybara.current_driver = :poltergeist_no_js_errors
+
         create_list(:comment, 2)
 
         visit moderation_comments_path
diff --git a/spec/features/moderation/debates_spec.rb b/spec/features/moderation/debates_spec.rb
index 78aca9b7e..8a729efe7 100644
--- a/spec/features/moderation/debates_spec.rb
+++ b/spec/features/moderation/debates_spec.rb
@@ -91,6 +91,8 @@ feature 'Moderate debates' do
       end
 
       scenario "select all/none", :js do
+        Capybara.current_driver = :poltergeist_no_js_errors
+
         create_list(:debate, 2)
 
         visit moderation_debates_path
diff --git a/spec/features/moderation/proposals_spec.rb b/spec/features/moderation/proposals_spec.rb
index ab8da4764..6acff7c71 100644
--- a/spec/features/moderation/proposals_spec.rb
+++ b/spec/features/moderation/proposals_spec.rb
@@ -83,6 +83,8 @@ feature 'Moderate proposals' do
       end
 
       scenario "select all/none", :js do
+        Capybara.current_driver = :poltergeist_no_js_errors
+
         create_list(:proposal, 2)
 
         visit moderation_proposals_path
diff --git a/spec/features/officing/residence_spec.rb b/spec/features/officing/residence_spec.rb
new file mode 100644
index 000000000..bc147a919
--- /dev/null
+++ b/spec/features/officing/residence_spec.rb
@@ -0,0 +1,50 @@
+require 'rails_helper'
+
+feature 'Residence' do
+  let(:officer) { create(:poll_officer) }
+
+  background do
+    login_as(officer.user)
+    visit officing_root_path
+  end
+
+  scenario "Verify voter" do
+    within("#side_menu") do
+      click_link "Validate document"
+    end
+
+    fill_in 'residence_document_number', with: "12345678Z"
+    select 'DNI', from: 'residence_document_type'
+    select_date '31-December-1980', from: 'residence_date_of_birth'
+
+    click_button 'Validate document'
+
+    expect(page).to have_content 'Document verified with Census'
+  end
+
+  scenario "Error on verify" do
+    within("#side_menu") do
+      click_link "Validate document"
+    end
+
+    click_button 'Validate document'
+    expect(page).to have_content /\d errors? prevented the verification of this document/
+  end
+
+  scenario "Error on Census" do
+    within("#side_menu") do
+      click_link "Validate document"
+    end
+
+    fill_in 'residence_document_number', with: "12345678Z"
+    select 'DNI', from: 'residence_document_type'
+    select '1997', from: 'residence_date_of_birth_1i'
+    select 'January', from: 'residence_date_of_birth_2i'
+    select '1', from: 'residence_date_of_birth_3i'
+
+    click_button 'Validate document'
+
+    expect(page).to have_content 'The Census was unable to verify this document'
+  end
+
+end
\ No newline at end of file
diff --git a/spec/features/officing/voters_spec.rb b/spec/features/officing/voters_spec.rb
new file mode 100644
index 000000000..a94c764ec
--- /dev/null
+++ b/spec/features/officing/voters_spec.rb
@@ -0,0 +1,55 @@
+require 'rails_helper'
+
+feature 'Voters' do
+
+  let(:officer) { create(:poll_officer) }
+
+  background do
+    login_as(officer.user)
+    create(:geozone, :in_census)
+
+    #remove once foundation.equalizer js error has been fixed
+    Capybara.current_driver = :poltergeist_no_js_errors
+  end
+
+  scenario "Can vote", :js do
+    poll = create(:poll)
+
+    visit new_officing_residence_path
+    officing_verify_residence
+
+    expect(page).to have_content "Polls"
+    expect(page).to have_content poll.name
+
+    click_button "Validate vote"
+
+    expect(page).to have_content "Vote validated successfully"
+    expect(page).to_not have_button "Validate vote"
+
+    page.evaluate_script("window.location.reload()")
+    expect(page).to have_content "Has already participated in this poll"
+    expect(page).to_not have_button "Validate vote"
+  end
+
+  scenario "Already voted", :js do
+    poll1 = create(:poll)
+    poll2 = create(:poll)
+
+    user = create(:user, :level_two)
+    voter = create(:poll_voter, poll: poll1, user: user)
+
+    visit new_officing_voter_path(id: voter.user.id)
+
+    within("#poll_#{poll1.id}") do
+      expect(page).to have_content "Has already participated in this poll"
+      expect(page).to_not have_button "Validate vote"
+    end
+
+    within("#poll_#{poll2.id}") do
+      expect(page).to have_button "Validate vote"
+    end
+  end
+
+  #Fix and use answerable_by(user)
+  xscenario "Display only answerable polls"
+end
\ No newline at end of file
diff --git a/spec/features/polls/questions_spec.rb b/spec/features/polls/questions_spec.rb
index d7d4f8c63..39b60930d 100644
--- a/spec/features/polls/questions_spec.rb
+++ b/spec/features/polls/questions_spec.rb
@@ -15,6 +15,7 @@ feature 'Poll Questions' do
   context 'Answering' do
     let(:geozone) { create(:geozone) }
     let(:poll) { create(:poll, geozone_restricted: true, geozone_ids: [geozone.id]) }
+
     scenario 'Non-logged in users' do
       question = create(:poll_question, valid_answers: 'Han Solo, Chewbacca')
 
diff --git a/spec/features/valuation/budget_investments_spec.rb b/spec/features/valuation/budget_investments_spec.rb
index bac7d1fe2..a3f5a1705 100644
--- a/spec/features/valuation/budget_investments_spec.rb
+++ b/spec/features/valuation/budget_investments_spec.rb
@@ -55,6 +55,8 @@ feature 'Valuation budget investments' do
   end
 
   scenario "Index filtering by heading", :js do
+    Capybara.current_driver = :poltergeist_no_js_errors
+
     group = create(:budget_group, budget: @budget)
     heading1 = create(:budget_heading, name: "District 9", group: group)
     heading2 = create(:budget_heading, name: "Down to the river", group: group)
diff --git a/spec/features/valuation/spending_proposals_spec.rb b/spec/features/valuation/spending_proposals_spec.rb
index 25c5dfa61..035ed59fd 100644
--- a/spec/features/valuation/spending_proposals_spec.rb
+++ b/spec/features/valuation/spending_proposals_spec.rb
@@ -83,6 +83,8 @@ feature 'Valuation spending proposals' do
   end
 
   scenario "Index filtering by geozone", :js do
+    Capybara.current_driver = :poltergeist_no_js_errors
+
     geozone = create(:geozone, name: "District 9")
     spending_proposal1 = create(:spending_proposal, title: "Realocate visitors", geozone: geozone)
     spending_proposal2 = create(:spending_proposal, title: "Destroy the city")
diff --git a/spec/models/officing/residence_spec.rb b/spec/models/officing/residence_spec.rb
new file mode 100644
index 000000000..1f09f8123
--- /dev/null
+++ b/spec/models/officing/residence_spec.rb
@@ -0,0 +1,87 @@
+require 'rails_helper'
+
+describe Officing::Residence do
+
+  let!(:geozone)  { create(:geozone, census_code: "01") }
+  let(:residence) { build(:officing_residence, document_number: "12345678Z") }
+
+  describe "validations" do
+
+    it "should be valid" do
+      expect(residence).to be_valid
+    end
+
+    describe "dates" do
+      it "should be valid with a valid date of birth" do
+        residence = Officing::Residence.new({"date_of_birth(3i)"=>"1", "date_of_birth(2i)"=>"1", "date_of_birth(1i)"=>"1980"})
+        expect(residence.errors[:date_of_birth].size).to eq(0)
+      end
+
+      it "should not be valid without a date of birth" do
+        residence = Officing::Residence.new({"date_of_birth(3i)"=>"", "date_of_birth(2i)"=>"", "date_of_birth(1i)"=>""})
+        expect(residence).to_not be_valid
+        expect(residence.errors[:date_of_birth]).to include("can't be blank")
+      end
+    end
+
+    it "should validate user has allowed age" do
+      residence = Officing::Residence.new({"date_of_birth(3i)"=>"1", "date_of_birth(2i)"=>"1", "date_of_birth(1i)"=>"#{5.year.ago.year}"})
+      expect(residence).to_not be_valid
+      expect(residence.errors[:date_of_birth]).to include("You don't have the required age to participate")
+    end
+
+  end
+
+  describe "new" do
+    it "should upcase document number" do
+      residence = Officing::Residence.new({document_number: "x1234567z"})
+      expect(residence.document_number).to eq("X1234567Z")
+    end
+
+    it "should remove all characters except numbers and letters" do
+      residence = Officing::Residence.new({document_number: " 12.345.678 - B"})
+      expect(residence.document_number).to eq("12345678B")
+    end
+  end
+
+  describe "save" do
+
+    it "should store document number, document type, geozone, date of birth and gender" do
+      residence.save
+      user = residence.user
+
+      expect(user.document_number).to eq('12345678Z')
+      expect(user.document_type).to eq("1")
+      expect(user.date_of_birth.year).to eq(1980)
+      expect(user.date_of_birth.month).to eq(12)
+      expect(user.date_of_birth.day).to eq(31)
+      expect(user.gender).to eq('male')
+      expect(user.geozone).to eq(geozone)
+    end
+
+    it "should find existing user and use demographic information" do
+      geozone = create(:geozone)
+      create(:user, document_number: "12345678Z",
+                    document_type: "1",
+                    date_of_birth: Date.new(1981, 11, 30),
+                    gender: 'female',
+                    geozone: geozone)
+
+      residence = build(:officing_residence,
+                        document_number: "12345678Z",
+                        document_type: "1")
+
+      residence.save
+      user = residence.user
+
+      expect(user.document_number).to eq('12345678Z')
+      expect(user.document_type).to eq("1")
+      expect(user.date_of_birth.year).to eq(1981)
+      expect(user.date_of_birth.month).to eq(11)
+      expect(user.date_of_birth.day).to eq(30)
+      expect(user.gender).to eq('female')
+      expect(user.geozone).to eq(geozone)
+    end
+
+  end
+end
\ No newline at end of file
diff --git a/spec/models/poll/poll_spec.rb b/spec/models/poll/poll_spec.rb
index b2ec29e5c..b0bf923c0 100644
--- a/spec/models/poll/poll_spec.rb
+++ b/spec/models/poll/poll_spec.rb
@@ -64,6 +64,7 @@ describe :poll do
 
   describe "#document_has_voted?" do
     it "returns true if Poll::Voter with document exists" do
+      poll = create(:poll)
       voter = create(:poll_voter, :valid_document, poll: poll)
 
       expect(poll.document_has_voted?(voter.document_number, voter.document_type)).to eq(true)
diff --git a/spec/models/poll/voter_spec.rb b/spec/models/poll/voter_spec.rb
index 88541dc82..0770c5654 100644
--- a/spec/models/poll/voter_spec.rb
+++ b/spec/models/poll/voter_spec.rb
@@ -5,9 +5,29 @@ describe :voter do
   let(:poll) { create(:poll) }
   let(:booth) { create(:poll_booth) }
   let(:booth_assignment) { create(:poll_booth_assignment, poll: poll, booth: booth) }
+  let(:voter) { create(:poll_voter) }
 
   describe "validations" do
 
+    it "should be valid" do
+      expect(voter).to be_valid
+    end
+
+    it "should not be valid without a user" do
+      voter.user = nil
+      expect(voter).to_not be_valid
+    end
+
+    it "should not be valid without a poll" do
+      voter.poll = nil
+      expect(voter).to_not be_valid
+    end
+
+    it "should not be valid without a geozone" do
+      voter.user.geozone = nil
+      expect(voter).to_not be_valid
+    end
+
     it "should be valid if has not voted" do
        voter = build(:poll_voter, :valid_document)
 
@@ -15,16 +35,20 @@ describe :voter do
     end
 
     it "should not be valid if the user has already voted in the same poll or booth_assignment" do
-      voter1 = create(:poll_voter, :valid_document, poll: poll)
-      voter2 =  build(:poll_voter, :valid_document, poll: poll)
+      user = create(:user, :level_two)
+
+      voter1 = create(:poll_voter, user: user, poll: poll)
+      voter2 =  build(:poll_voter, user: user, poll: poll)
 
       expect(voter2).to_not be_valid
       expect(voter2.errors.messages[:document_number]).to eq(["User has already voted"])
     end
 
     it "should not be valid if the user has already voted in the same poll/booth" do
-      voter1 = create(:poll_voter, :valid_document, poll: poll, booth_assignment: booth_assignment)
-      voter2 =  build(:poll_voter, :valid_document, poll: poll, booth_assignment: booth_assignment)
+      user = create(:user, :level_two)
+
+      voter1 = create(:poll_voter, user: user, poll: poll, booth_assignment: booth_assignment)
+      voter2 =  build(:poll_voter, user: user, poll: poll, booth_assignment: booth_assignment)
 
       expect(voter2).to_not be_valid
       expect(voter2.errors.messages[:document_number]).to eq(["User has already voted"])
@@ -34,8 +58,10 @@ describe :voter do
       booth_assignment1 = create(:poll_booth_assignment, poll: poll)
       booth_assignment2 = create(:poll_booth_assignment, poll: poll)
 
-      voter1 = create(:poll_voter, :valid_document, poll: poll, booth_assignment: booth_assignment1)
-      voter2 =  build(:poll_voter, :valid_document, poll: poll, booth_assignment: booth_assignment2)
+      user = create(:user, :level_two)
+
+      voter1 = create(:poll_voter, user: user, poll: poll, booth_assignment: booth_assignment1)
+      voter2 =  build(:poll_voter, user: user, poll: poll, booth_assignment: booth_assignment2)
 
       expect(voter2).to_not be_valid
       expect(voter2.errors.messages[:document_number]).to eq(["User has already voted"])
@@ -45,8 +71,10 @@ describe :voter do
       booth_assignment1 = create(:poll_booth_assignment, booth: booth)
       booth_assignment2 = create(:poll_booth_assignment, booth: booth, poll: poll)
 
-      voter1 = create(:poll_voter, :valid_document, booth_assignment: booth_assignment1)
-      voter2 =  build(:poll_voter, :valid_document, booth_assignment: booth_assignment2)
+      user = create(:user, :level_two)
+
+      voter1 = create(:poll_voter, user: user, booth_assignment: booth_assignment1)
+      voter2 =  build(:poll_voter, user: user, booth_assignment: booth_assignment2)
 
       expect(voter2).to be_valid
     end
@@ -55,10 +83,37 @@ describe :voter do
       answer = create(:poll_answer)
       answer.record_voter_participation
 
-      voter = build(:poll_voter, poll: answer.question.poll, document_number: answer.author.document_number, document_type: "1")
+      voter = build(:poll_voter, poll: answer.question.poll, user: answer.author)
       expect(voter).to_not be_valid
       expect(voter.errors.messages[:document_number]).to eq(["User has already voted"])
     end
 
   end
+
+  describe "save" do
+
+    it "sets demographic info" do
+      geozone = create(:geozone)
+      user = create(:user,
+                    geozone: geozone,
+                    date_of_birth: 30.years.ago,
+                    gender: "female")
+
+      voter = build(:poll_voter, user: user)
+      voter.save
+
+      expect(voter.geozone).to eq(geozone)
+      expect(voter.age).to eq(30)
+      expect(voter.gender).to eq("female")
+    end
+
+    it "sets user info" do
+      user = create(:user, document_number: "1234A", document_type: "1")
+      voter = build(:poll_voter, user: user)
+      voter.save
+
+      expect(voter.document_number).to eq("1234A")
+      expect(voter.document_type).to eq("1")
+    end
+  end
 end
\ No newline at end of file
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index a40934d92..97a94bec7 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -105,4 +105,9 @@ RSpec.configure do |config|
 end
 
 # Parallel build helper configuration for travis
-Knapsack::Adapters::RSpecAdapter.bind
\ No newline at end of file
+Knapsack::Adapters::RSpecAdapter.bind
+
+options = {js_errors: false}
+Capybara.register_driver :poltergeist_no_js_errors do |app|
+  Capybara::Poltergeist::Driver.new(app, options)
+end
\ No newline at end of file
diff --git a/spec/support/common_actions.rb b/spec/support/common_actions.rb
index 1e317909b..008403dbe 100644
--- a/spec/support/common_actions.rb
+++ b/spec/support/common_actions.rb
@@ -141,6 +141,16 @@ module CommonActions
     expect(page).to have_content 'Residence verified'
   end
 
+  def officing_verify_residence
+    fill_in 'residence_document_number', with: "12345678Z"
+    select 'DNI', from: 'residence_document_type'
+    select_date '31-December-1980', from: 'residence_date_of_birth'
+
+    click_button 'Validate document'
+
+    expect(page).to have_content 'Document verified with Census'
+  end
+
   def confirm_phone
     fill_in 'sms_phone', with: "611111111"
     click_button 'Send'