Revert "Fixes: #1716 Removed Mac check, added IP check when dhcp enabled"

This reverts commit 65749a1c71e2fb62ea9f46c0efbd74a261c7126c.

Revert because the code will finally look more like the original code