fixes for change id/email