[Forms][fix] option not being selected

It seems that I left some code in #1152 while looking for a proper fix. 
This also fixes #1245.