Settings forms handling updates for #693; Bug fixes for #1042