Updates to getUser function