Added Email activation
Now really added email activation