Issue #2621570 by eshta: Ensure correct protectable form fields are shown for adding and editing form protection.