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

... "from" setting, some CS fixes and some code refactoring as well