The present disclosure describes a method for adaptive WiFi roaming, where an electronic device and an access point advertise their networking capability. The networking capability may be, for example, the capability to support at least one enterprise feature. Based on the advertisements transmitted by the electronic device, the access point can determine that the electronic device can support the at least one enterprise feature and may selectively enable the at least one enterprise feature. Additionally, based on advertisements transmitted by the access point, the electronic device can determine that the access point can support the at least one enterprise feature. Based on this mutual determination, the access point and electronic device may continue an association process based on the at least one enterprise feature.