I think we are OK here since all of these fields (including username) were not being included in the context before this change (just user_id).

That said we might want some of them (like username).