added user activation and fixed email delivery