fix(settings): Handle email change restriction separately from display name change restriction

fix(settings): Handle email change restriction separately from display name change restriction #16075