Fixed up authentication expiry recalculation problems for sender side