Merge pull request #6371 from MrPetovan/bug/6370-use-nickname-in-register-emails