This fixes #7689.  It now saves on the change of role.