Support new logic in user view page