[#7683] Optional primary email address reset
[#7683] Bugfix
[#5700] Refactored & improved tests
[#5700] Updated notification message