fixed email and button active state