Comment 3 for bug 427775

In the original script broken logic - dhcp should be checked when the no of their preferences, rather than when they are disabled.
Even after the dhcp settings should override if they are there.