Fix for activation and password reset emails.
Merge pull request #632 from benkonrath/bug-fixes

Fix for activation and password reset emails.