Email account activation final commit

Final commit