diff --git a/app/controllers/concerns/search.rb b/app/controllers/concerns/search.rb
index 922ad93cc..b4e9fac68 100644
--- a/app/controllers/concerns/search.rb
+++ b/app/controllers/concerns/search.rb
@@ -41,11 +41,11 @@ module Search
   end
 
   def search_finish_date
-    (params[:advanced_search][:date_max].to_date rescue Date.today) || Date.today
+    (params[:advanced_search][:date_max].to_date rescue Date.current) || Date.current
   end
 
   def search_date_range
-    [100.years.ago, search_start_date].max.beginning_of_day..[search_finish_date, Date.today].min.end_of_day
+    [100.years.ago, search_start_date].max.beginning_of_day..[search_finish_date, Date.current].min.end_of_day
   end
 
   def set_search_order
@@ -54,4 +54,4 @@ module Search
     end
   end
 
-end
\ No newline at end of file
+end
diff --git a/app/models/direct_message.rb b/app/models/direct_message.rb
index 476194aea..b36cca705 100644
--- a/app/models/direct_message.rb
+++ b/app/models/direct_message.rb
@@ -8,7 +8,7 @@ class DirectMessage < ActiveRecord::Base
   validates :receiver, presence: true
   validate  :max_per_day
 
-  scope :today, lambda { where('DATE(created_at) = ?', Date.today) }
+  scope :today, lambda { where('DATE(created_at) = ?', Date.current) }
 
   def max_per_day
     return if errors.any?
diff --git a/app/views/management/proposals/print.html.erb b/app/views/management/proposals/print.html.erb
index 71220c74b..3314dc1e5 100644
--- a/app/views/management/proposals/print.html.erb
+++ b/app/views/management/proposals/print.html.erb
@@ -8,7 +8,7 @@
       <%= image_tag "header_print_proposals.jpg", class: "for-print-only" %>
 
       <div class="filters">
-        <span class="for-print-only date-for-print"><%= l Date.today, format: :long %></span>
+        <span class="for-print-only date-for-print"><%= l Date.current, format: :long %></span>
 
         <h2 class="inline-block">
           <span class="not-print"><%= t("proposals.index.select_order_long") %></span>
diff --git a/lib/migrate_spending_proposals_to_investments.rb b/lib/migrate_spending_proposals_to_investments.rb
index 5db10e2bd..9ef2f096d 100644
--- a/lib/migrate_spending_proposals_to_investments.rb
+++ b/lib/migrate_spending_proposals_to_investments.rb
@@ -1,7 +1,7 @@
 class MigrateSpendingProposalsToInvestments
 
   def import(sp)
-    budget = Budget.last || Budget.create!(name: Date.today.year.to_s, currency_symbol: "€")
+    budget = Budget.last || Budget.create!(name: Date.current.year.to_s, currency_symbol: "€")
 
     group = nil
     heading = nil