Make User page consistent with Workbench page