Updated the behaviour for form chooser for issue251

Fixes issue251

Merge request reports