diff --git a/app/models/poll.rb b/app/models/poll.rb
index 5c65b688f..27125d8a1 100644
--- a/app/models/poll.rb
+++ b/app/models/poll.rb
@@ -80,6 +80,10 @@ class Poll < ActiveRecord::Base
     Poll::Voter.where(poll: self, user: user, origin: "booth").exists?
   end
 
+  def voted_in_web?(user)
+    Poll::Voter.where(poll: self, user: user, origin: "web").exists?
+  end
+
   def date_range
     unless starts_at.present? && ends_at.present? && starts_at <= ends_at
       errors.add(:starts_at, I18n.t('errors.messages.invalid_date_range'))
diff --git a/app/views/polls/show.html.erb b/app/views/polls/show.html.erb
index ce2a6d46a..f2ad579d4 100644
--- a/app/views/polls/show.html.erb
+++ b/app/views/polls/show.html.erb
@@ -39,7 +39,7 @@
         </div>
       <% else %>
 
-        <% if current_user && !@poll.votable_by?(current_user) %>
+        <% if current_user && @poll.voted_in_web?(current_user) %>
           <div class="callout warning">
             <%= t("polls.show.already_voted_in_web") %>
           </div>
diff --git a/spec/features/polls/voter_spec.rb b/spec/features/polls/voter_spec.rb
index 334696768..d5770cd0e 100644
--- a/spec/features/polls/voter_spec.rb
+++ b/spec/features/polls/voter_spec.rb
@@ -41,6 +41,27 @@ feature "Voter" do
       expect(Poll::Voter.first.origin).to eq("web")
     end
 
+    scenario "Voting via web as unverified user", :js do
+      poll = create(:poll)
+
+      question = create(:poll_question, poll: poll)
+      answer1 = create(:poll_question_answer, question: question, title: 'Yes')
+      answer2 = create(:poll_question_answer, question: question, title: 'No')
+
+      user = create(:user, :incomplete_verification)
+
+      login_as user
+      visit poll_path(poll)
+
+      within("#poll_question_#{question.id}_answers") do
+        expect(page).to_not have_link('Yes', href: "/questions/#{question.id}/answer?answer=Yes&token=")
+        expect(page).to_not have_link('No', href: "/questions/#{question.id}/answer?answer=No&token=")
+      end
+
+      expect(page).to have_content("You must verify your account in order to answer")
+      expect(page).to_not have_content("You have already participated in this poll. If you vote again it will be overwritten")
+    end
+
     scenario "Voting in booth", :js do
       user = create(:user, :in_census)