adding fixes for account renewals