email_activation function change