Ensure the entity form always submits with an id value