1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 2b58e0b90..8154924b9 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -69,7 +69,7 @@ class ApplicationController < ActionController::Base
   end
 
   def require_functional!
-    redirect_to edit_user_registration_path unless current_user.functional?
+    redirect_to edit_user_registration_path unless current_user&.functional?
   end
 
   def require_authenticated!
@@ -259,7 +259,7 @@ class ApplicationController < ActionController::Base
   end
 
   def authenticated_or_following?(account)
-    current_account? || following?(account)
+    current_user&.account.present? || following?(account)
   end
 
   def current_account?