Modified for active/inactive users