Fix issues with saving form settings