CISCONAED-1 - refactored user query to account for inactive users