Refactor user activation

for mail sending purposes.