Changes to handle login interactions[WIP]