[#7410] ticket:594 Show more info in password recovery flow
[#7410] ticket:594 Fix tests
[#7410] move email to a template
[#7410] whitespace fixes for templatized email