Improvements to User & DisplayName