Added initial login handling for users