Align `user` with the rest?