Cleanup of screen for the 'users' role (OMS-429)