1 files changed, 5 insertions, 1 deletions
diff --git a/lib/api/entities/user_safe.rb b/lib/api/entities/user_safe.rb
index fb99c2e960d..127a8ef2160 100644
--- a/lib/api/entities/user_safe.rb
+++ b/lib/api/entities/user_safe.rb
@@ -3,9 +3,13 @@
 module API
   module Entities
     class UserSafe < Grape::Entity
+      include RequestAwareEntity
+
       expose :id, :username
       expose :name do |user|
-        user.redacted_name(options[:current_user])
+        current_user = request.respond_to?(:current_user) ? request.current_user : options.fetch(:current_user, nil)
+
+        user.redacted_name(current_user)
       end
     end
   end