Adding login to User. Fixing bugs