Fixed login bug, where once you select login you are stuck on the login screen
Code refactor
Added unauthorized entry point