Fix wrong check for account data expiry. Also when expires make sure the
DB is updated again after a fresh GET