Add correct validation/protection on form (this throws debug warnings in 2.5)