updates to activation and Password Reset