Modified get user info to use username instead of user if