fix: Resolve #3624864 "Mismatched entity andor"

andres alvarezrequested to merge
issue/simple_oauth-3624864:3624864-mismatched-entity-andor into 6.1.x

Merge request reports