refactored code, added inactive users on login screen