Password Storage feature - Customisable Lifetime options

It would be good to be able to customise the Lifetime options for the Password Storage feature, particularly to be able to remove the "Never Expires" option for security reasons.