- remove activation form
- add resend form
- minor fixes