Refs https://github.com/CakeDC/users/issues/189 Fixing the Email default "from" setting, some CS fixes and some code refactoring as well
Merge pull request #190 from burzum/develop

Refs https://github.com/CakeDC/users/issues/189 Fixing the Email default...