Task#6361 - Undo change to fix creation of Felamimail account