Bug #46: Fix user expiry date calculation