[XFSAccount] Fix validuntil computation