Make disabled controls logic consistent