enhanced the handling of enabled/disabled flag.

It seems like the original action was the opposite of intent.  Also added an explicit handling of enabled=true.