Ability to Remove a User Expiration

[#1]

There is the option to add a user expiration, and to change / extend it but not to remove it so if you accidentally set an expiration or for example somebody decides to leave the business but we manage to retain them we can't ever remove that expiration. Minor but slightly annoying.