Set expiration date by default when adding additional shares

Fix #4823, #4734