Fixed getUser
merge conflicts?