Fix CurrentUserResource fields