AUI-1585 Account for inline forms