Small changes to CurrentUser