Fix a bug where the unique name for MSA accounts is not user friendly (has prefix in front of the e-mail).