Added user detection and user list