Refactor login+Constructor and Add addUser function
Resolve merge conflicts with old version