diff --git a/app/controllers/officing/voters_controller.rb b/app/controllers/officing/voters_controller.rb
index 49b7636fd..78233d41c 100644
--- a/app/controllers/officing/voters_controller.rb
+++ b/app/controllers/officing/voters_controller.rb
@@ -20,6 +20,7 @@ class Officing::VotersController < Officing::BaseController
                              poll: @poll,
                              origin: "booth",
                              officer: current_user.poll_officer,
+                             booth_assignment: Poll::BoothAssignment.where(poll: @poll, booth: current_booth).first,
                              officer_assignment: officer_assignment(@poll))
     @voter.save!
   end
@@ -35,6 +36,7 @@ class Officing::VotersController < Officing::BaseController
                              .by_poll(poll)
                              .by_booth(current_booth)
                              .by_date(Date.current)
+                             .where(final: false)
                              .first
     end