diff --git a/app/components/comments/votes_component.html.erb b/app/components/comments/votes_component.html.erb
index 701bd225f..e92b2bb25 100644
--- a/app/components/comments/votes_component.html.erb
+++ b/app/components/comments/votes_component.html.erb
@@ -1,5 +1,5 @@
 <div class="votes">
-  <% if user_signed_in? %>
+  <% if current_user %>
     <%= t("comments.comment.votes", count: comment.total_votes) %>
     &nbsp;|&nbsp;
 
@@ -36,7 +36,7 @@
       <% end %>
       <%= comment.total_dislikes %>
     </span>
-  <% elsif !user_signed_in? %>
+  <% else %>
     <div class="participation-allowed">
       <%= t("comments.comment.votes", count: comment.total_votes) %>
       &nbsp;|&nbsp;
diff --git a/app/components/comments/votes_component.rb b/app/components/comments/votes_component.rb
index 2287eff18..d776aaaba 100644
--- a/app/components/comments/votes_component.rb
+++ b/app/components/comments/votes_component.rb
@@ -1,6 +1,6 @@
 class Comments::VotesComponent < ApplicationComponent
   attr_reader :comment
-  delegate :user_signed_in?, :can?, :link_to_signin, :link_to_signup, to: :helpers
+  delegate :current_user, :can?, :link_to_signin, :link_to_signup, to: :helpers
 
   def initialize(comment)
     @comment = comment
diff --git a/app/components/debates/votes_component.html.erb b/app/components/debates/votes_component.html.erb
index 8c0570e67..a756f579e 100644
--- a/app/components/debates/votes_component.html.erb
+++ b/app/components/debates/votes_component.html.erb
@@ -1,7 +1,7 @@
 <% voted_classes = css_classes_for_vote(debate) %>
 <div class="votes">
   <div class="in-favor inline-block">
-    <% if user_signed_in? %>
+    <% if current_user %>
       <%= link_to vote_debate_path(debate, value: "yes"),
           class: "like #{voted_classes[:in_favor]}", title: t("votes.agree"), method: "post", remote: true do %>
         <span class="icon-like">
@@ -22,7 +22,7 @@
   <span class="divider"></span>
 
   <div class="against inline-block">
-    <% if user_signed_in? %>
+    <% if current_user %>
       <%= link_to vote_debate_path(debate, value: "no"), class: "unlike #{voted_classes[:against]}", title: t("votes.disagree"), method: "post", remote: true do %>
         <span class="icon-unlike">
           <span class="show-for-sr"><%= t("votes.disagree") %></span>
@@ -43,19 +43,19 @@
     <%= t("debates.debate.votes", count: debate.votes_score) %>
   </span>
 
-  <% if user_signed_in? && current_user.organization? %>
+  <% if current_user&.organization? %>
     <div class="participation-not-allowed" style="display:none" aria-hidden="false">
       <p>
         <%= t("votes.organizations") %>
       </p>
     </div>
-  <% elsif user_signed_in? && !debate.votable_by?(current_user) %>
+  <% elsif current_user && !debate.votable_by?(current_user) %>
     <div class="participation-not-allowed" style="display:none" aria-hidden="false">
       <p>
         <%= sanitize(t("votes.anonymous", verify_account: link_to_verify_account)) %>
       </p>
     </div>
-  <% elsif !user_signed_in? %>
+  <% elsif !current_user %>
     <div tabindex="0">
       <%= render "shared/login_to_vote" %>
     </div>
diff --git a/app/components/debates/votes_component.rb b/app/components/debates/votes_component.rb
index 2c75f7f43..80fedc9ba 100644
--- a/app/components/debates/votes_component.rb
+++ b/app/components/debates/votes_component.rb
@@ -1,6 +1,6 @@
 class Debates::VotesComponent < ApplicationComponent
   attr_reader :debate
-  delegate :css_classes_for_vote, :current_user, :link_to_verify_account, :user_signed_in?, :votes_percentage, to: :helpers
+  delegate :css_classes_for_vote, :current_user, :link_to_verify_account, :votes_percentage, to: :helpers
 
   def initialize(debate)
     @debate = debate
diff --git a/app/components/legislation/proposals/votes_component.html.erb b/app/components/legislation/proposals/votes_component.html.erb
index 34961266d..f3715f41f 100644
--- a/app/components/legislation/proposals/votes_component.html.erb
+++ b/app/components/legislation/proposals/votes_component.html.erb
@@ -2,7 +2,7 @@
 <div class="votes">
   <% if proposal.process.proposals_phase.open? %>
     <div class="in-favor inline-block">
-      <% if user_signed_in? %>
+      <% if current_user %>
         <%= link_to vote_legislation_process_proposal_path(process_id: proposal.process, id: proposal, value: "yes"),
             class: "like #{voted_classes[:in_favor]}", title: t("votes.agree"), method: "post", remote: true do %>
           <span class="icon-like">
@@ -23,7 +23,7 @@
     <span class="divider"></span>
 
     <div class="against inline-block">
-      <% if user_signed_in? %>
+      <% if current_user %>
         <%= link_to vote_legislation_process_proposal_path(process_id: proposal.process, id: proposal, value: "no"), class: "unlike #{voted_classes[:against]}", title: t("votes.disagree"), method: "post", remote: true do %>
           <span class="icon-unlike">
             <span class="show-for-sr"><%= t("votes.disagree") %></span>
@@ -45,20 +45,20 @@
     <%= t("proposals.proposal.votes", count: proposal.votes_score) %>
   </span>
 
-  <% if user_signed_in? && current_user.organization? %>
+  <% if current_user&.organization? %>
     <div class="participation-not-allowed" style="display:none" aria-hidden="false">
       <p>
         <%= t("votes.organizations") %>
       </p>
     </div>
-  <% elsif user_signed_in? && !proposal.votable_by?(current_user) %>
+  <% elsif current_user && !proposal.votable_by?(current_user) %>
     <div class="participation-not-allowed" style="display:none" aria-hidden="false">
       <p>
         <%= sanitize(t("legislation.proposals.not_verified",
             verify_account: link_to_verify_account)) %>
       </p>
     </div>
-  <% elsif !user_signed_in? %>
+  <% elsif !current_user %>
     <div tabindex="0">
       <%= render "shared/login_to_vote" %>
     </div>
diff --git a/app/components/legislation/proposals/votes_component.rb b/app/components/legislation/proposals/votes_component.rb
index 0dabb29ec..f59d11d68 100644
--- a/app/components/legislation/proposals/votes_component.rb
+++ b/app/components/legislation/proposals/votes_component.rb
@@ -1,6 +1,6 @@
 class Legislation::Proposals::VotesComponent < ApplicationComponent
   attr_reader :proposal
-  delegate :css_classes_for_vote, :current_user, :link_to_verify_account, :user_signed_in?, :votes_percentage, to: :helpers
+  delegate :css_classes_for_vote, :current_user, :link_to_verify_account, :votes_percentage, to: :helpers
 
   def initialize(proposal)
     @proposal = proposal
diff --git a/app/components/proposals/votes_component.html.erb b/app/components/proposals/votes_component.html.erb
index 1834cc094..5ca164d94 100644
--- a/app/components/proposals/votes_component.html.erb
+++ b/app/components/proposals/votes_component.html.erb
@@ -6,7 +6,7 @@
       <div class="supported callout success">
         <%= t("proposals.proposal.already_supported") %>
       </div>
-    <% elsif user_signed_in? && proposal.votable_by?(current_user) %>
+    <% elsif current_user && proposal.votable_by?(current_user) %>
       <%= link_to vote_url,
           class: "button button-support small expanded",
           title: t("proposals.proposal.support_title"), method: "post", remote: true do %>
@@ -19,13 +19,13 @@
     <% end %>
   </div>
 
-  <% if user_signed_in? && current_user.organization? %>
+  <% if current_user&.organization? %>
     <div class="participation-not-allowed" style="display:none" aria-hidden="false">
       <p>
         <%= t("votes.organizations") %>
       </p>
     </div>
-  <% elsif user_signed_in? && !proposal.votable_by?(current_user) %>
+  <% elsif current_user && !proposal.votable_by?(current_user) %>
     <div tabindex="0">
       <div class="participation-not-allowed" style="display:none" aria-hidden="false">
         <p>
@@ -33,7 +33,7 @@
         </p>
       </div>
     </div>
-  <% elsif !user_signed_in? %>
+  <% elsif !current_user %>
     <div tabindex="0">
       <%= render "shared/login_to_vote" %>
     </div>
diff --git a/app/components/proposals/votes_component.rb b/app/components/proposals/votes_component.rb
index 0b42839c8..143b32ada 100644
--- a/app/components/proposals/votes_component.rb
+++ b/app/components/proposals/votes_component.rb
@@ -1,6 +1,6 @@
 class Proposals::VotesComponent < ApplicationComponent
   attr_reader :proposal
-  delegate :current_user, :link_to_verify_account, :user_signed_in?, to: :helpers
+  delegate :current_user, :link_to_verify_account, to: :helpers
 
   def initialize(proposal, vote_url: nil)
     @proposal = proposal