Fix and simplify getting user data after 6bc1af5