Fix typos
Use unified user object