diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
index debc344ac..4ad13f645 100644
--- a/config/initializers/doorkeeper.rb
+++ b/config/initializers/doorkeeper.rb
@@ -20,8 +20,8 @@ Doorkeeper.configure do
   access_token_generator '::Doorkeeper::JWT'
 
   admin_authenticator do
-    user = User.find_by_id(session[:www_user_id])
-    unless user #&& user.admin_or_business?
+    user = current_user || User.find_by_id(session[:www_user_id])
+    unless user && user.admin_or_business?
       redirect_to root_url
     end
   end