Added name/id attributes to nonce fields using defaults, see #23165.