Fix other form elements in #552 part 2