Switching User and login work to seperate branch