Only issue tokens to active users
Simplify a condition in paginator