fix for change role, blank dc page
re-order