Merge pull request #1183 from taiwen/develop

Fixed mail notification issues in user module #1142 discovered by @Marc-...
Update translations
Fixed variabled name in user module email templates