Now uses User everywhere instead of direct references to the pseudo.