Fixed activation, added neglected validations