Refactor user activation

for mail sending purposes.
Fine then +1