Fix the handling of expiry times when modifying roles.
Fix expiry date handling for users.