Better handling with form embedding