Fix scope on User model