diff --git a/app/models/post_vote.rb b/app/models/post_vote.rb
index e1dd75fa4..fdc9aa896 100644
--- a/app/models/post_vote.rb
+++ b/app/models/post_vote.rb
@@ -25,7 +25,7 @@ class PostVote < ApplicationRecord
   end
 
   def initialize_attributes
-    self.user_id ||= CurrentUser.user.id
+    self.user_id ||= CurrentUser.id
 
     if vote == "up"
       self.score = 1
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
index 1c7ea358b..f2651be56 100644
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -189,12 +189,12 @@ class WikiPage < ApplicationRecord
 
   def merge_version?
     prev = versions.last
-    prev && prev.updater_id == CurrentUser.user.id && prev.updated_at > 1.hour.ago
+    prev && prev.updater_id == CurrentUser.id && prev.updated_at > 1.hour.ago
   end
 
   def create_new_version
     versions.create(
-      :updater_id => CurrentUser.user.id,
+      :updater_id => CurrentUser.id,
       :updater_ip_addr => CurrentUser.ip_addr,
       :title => title,
       :body => body,