Feature #685 Admin and Email activation option