Updated quote form behaviour