Small Airtime Pro fix for ShowFormService
Merge branch '2.5.x' into 2.5.x-saas