Change standard enable handling - if not disabled, enable