diff --git a/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.ts b/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.ts
index dea74f364f..bd138cad29 100644
--- a/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.ts
+++ b/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.ts
@@ -87,10 +87,6 @@ export class TrialBillingStepComponent implements OnInit {
   }
 
   async submit(): Promise<void> {
-    if (!this.taxInfoComponent.taxFormGroup.valid) {
-      this.taxInfoComponent.taxFormGroup.markAllAsTouched();
-    }
-
     this.formPromise = this.createOrganization();
 
     const organizationId = await this.formPromise;
diff --git a/apps/web/src/app/billing/individual/premium.component.ts b/apps/web/src/app/billing/individual/premium.component.ts
index 9449e5cd25..79a8bad75a 100644
--- a/apps/web/src/app/billing/individual/premium.component.ts
+++ b/apps/web/src/app/billing/individual/premium.component.ts
@@ -64,11 +64,7 @@ export class PremiumComponent implements OnInit {
       return;
     }
   }
-
   submit = async () => {
-    if (!this.taxInfoComponent.taxFormGroup.valid) {
-      this.taxInfoComponent.taxFormGroup.markAllAsTouched();
-    }
     this.licenseForm.markAllAsTouched();
     this.addonForm.markAllAsTouched();
     if (this.selfHosted) {
diff --git a/apps/web/src/app/billing/organizations/organization-plans.component.ts b/apps/web/src/app/billing/organizations/organization-plans.component.ts
index bc49c1c33b..2228ad9f3a 100644
--- a/apps/web/src/app/billing/organizations/organization-plans.component.ts
+++ b/apps/web/src/app/billing/organizations/organization-plans.component.ts
@@ -547,9 +547,6 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
   }
 
   submit = async () => {
-    if (!this.taxComponent.taxFormGroup.valid) {
-      this.taxComponent.taxFormGroup.markAllAsTouched();
-    }
     if (this.singleOrgPolicyBlock) {
       return;
     }
diff --git a/apps/web/src/app/billing/shared/adjust-payment-dialog.component.ts b/apps/web/src/app/billing/shared/adjust-payment-dialog.component.ts
index 3a850982cf..8f16daeaa7 100644
--- a/apps/web/src/app/billing/shared/adjust-payment-dialog.component.ts
+++ b/apps/web/src/app/billing/shared/adjust-payment-dialog.component.ts
@@ -55,9 +55,6 @@ export class AdjustPaymentDialogComponent {
   }
 
   submit = async () => {
-    if (!this.taxInfoComponent.taxFormGroup.valid) {
-      this.taxInfoComponent.taxFormGroup.markAllAsTouched();
-    }
     const request = new PaymentRequest();
     const response = this.paymentComponent.createPaymentToken().then((result) => {
       request.paymentToken = result[0];
diff --git a/apps/web/src/app/billing/shared/tax-info.component.html b/apps/web/src/app/billing/shared/tax-info.component.html
index c254ffa4a4..30cca550d3 100644
--- a/apps/web/src/app/billing/shared/tax-info.component.html
+++ b/apps/web/src/app/billing/shared/tax-info.component.html
@@ -1,63 +1,363 @@
-<form [formGroup]="taxFormGroup">
-  <div class="tw-grid tw-grid-cols-12 tw-gap-4">
-    <div [ngClass]="trialFlow ? 'tw-col-span-7' : 'tw-col-span-6'">
-      <bit-form-field>
-        <bit-label>{{ "country" | i18n }}</bit-label>
-        <bit-select formControlName="country" autocomplete="country">
-          <bit-option
-            *ngFor="let country of countryList"
-            [value]="country.value"
-            [disabled]="country.disabled"
-            [label]="country.name"
-          ></bit-option>
-        </bit-select>
-      </bit-form-field>
-    </div>
-    <div [ngClass]="trialFlow ? 'tw-col-span-5' : 'tw-col-span-3'">
-      <bit-form-field>
-        <bit-label>{{ "zipPostalCode" | i18n }}</bit-label>
-        <input bitInput type="text" formControlName="postalCode" autocomplete="postal-code" />
-      </bit-form-field>
-    </div>
-    <div class="tw-col-span-6" *ngIf="showTaxIdCheckbox">
-      <bit-form-control>
-        <input bitCheckbox type="checkbox" formControlName="includeTaxId" />
-        <bit-label>{{ "includeVAT" | i18n }}</bit-label>
-      </bit-form-control>
+<div class="row">
+  <div [ngClass]="trialFlow ? 'col-7' : 'col-6'">
+    <div class="form-group">
+      <label for="addressCountry">{{ "country" | i18n }}</label>
+      <select
+        id="addressCountry"
+        class="form-control"
+        [(ngModel)]="taxInfo.country"
+        required
+        name="addressCountry"
+        autocomplete="country"
+        (change)="changeCountry()"
+      >
+        <option value="">-- Select --</option>
+        <option value="US">United States</option>
+        <option value="CN">China</option>
+        <option value="FR">France</option>
+        <option value="DE">Germany</option>
+        <option value="CA">Canada</option>
+        <option value="GB">United Kingdom</option>
+        <option value="AU">Australia</option>
+        <option value="IN">India</option>
+        <option value="-" disabled></option>
+        <option value="AF">Afghanistan</option>
+        <option value="AX">Åland Islands</option>
+        <option value="AL">Albania</option>
+        <option value="DZ">Algeria</option>
+        <option value="AS">American Samoa</option>
+        <option value="AD">Andorra</option>
+        <option value="AO">Angola</option>
+        <option value="AI">Anguilla</option>
+        <option value="AQ">Antarctica</option>
+        <option value="AG">Antigua and Barbuda</option>
+        <option value="AR">Argentina</option>
+        <option value="AM">Armenia</option>
+        <option value="AW">Aruba</option>
+        <option value="AT">Austria</option>
+        <option value="AZ">Azerbaijan</option>
+        <option value="BS">Bahamas</option>
+        <option value="BH">Bahrain</option>
+        <option value="BD">Bangladesh</option>
+        <option value="BB">Barbados</option>
+        <option value="BY">Belarus</option>
+        <option value="BE">Belgium</option>
+        <option value="BZ">Belize</option>
+        <option value="BJ">Benin</option>
+        <option value="BM">Bermuda</option>
+        <option value="BT">Bhutan</option>
+        <option value="BO">Bolivia, Plurinational State of</option>
+        <option value="BQ">Bonaire, Sint Eustatius and Saba</option>
+        <option value="BA">Bosnia and Herzegovina</option>
+        <option value="BW">Botswana</option>
+        <option value="BV">Bouvet Island</option>
+        <option value="BR">Brazil</option>
+        <option value="IO">British Indian Ocean Territory</option>
+        <option value="BN">Brunei Darussalam</option>
+        <option value="BG">Bulgaria</option>
+        <option value="BF">Burkina Faso</option>
+        <option value="BI">Burundi</option>
+        <option value="KH">Cambodia</option>
+        <option value="CM">Cameroon</option>
+        <option value="CV">Cape Verde</option>
+        <option value="KY">Cayman Islands</option>
+        <option value="CF">Central African Republic</option>
+        <option value="TD">Chad</option>
+        <option value="CL">Chile</option>
+        <option value="CX">Christmas Island</option>
+        <option value="CC">Cocos (Keeling) Islands</option>
+        <option value="CO">Colombia</option>
+        <option value="KM">Comoros</option>
+        <option value="CG">Congo</option>
+        <option value="CD">Congo, the Democratic Republic of the</option>
+        <option value="CK">Cook Islands</option>
+        <option value="CR">Costa Rica</option>
+        <option value="CI">Côte d'Ivoire</option>
+        <option value="HR">Croatia</option>
+        <option value="CU">Cuba</option>
+        <option value="CW">Curaçao</option>
+        <option value="CY">Cyprus</option>
+        <option value="CZ">Czech Republic</option>
+        <option value="DK">Denmark</option>
+        <option value="DJ">Djibouti</option>
+        <option value="DM">Dominica</option>
+        <option value="DO">Dominican Republic</option>
+        <option value="EC">Ecuador</option>
+        <option value="EG">Egypt</option>
+        <option value="SV">El Salvador</option>
+        <option value="GQ">Equatorial Guinea</option>
+        <option value="ER">Eritrea</option>
+        <option value="EE">Estonia</option>
+        <option value="ET">Ethiopia</option>
+        <option value="FK">Falkland Islands (Malvinas)</option>
+        <option value="FO">Faroe Islands</option>
+        <option value="FJ">Fiji</option>
+        <option value="FI">Finland</option>
+        <option value="GF">French Guiana</option>
+        <option value="PF">French Polynesia</option>
+        <option value="TF">French Southern Territories</option>
+        <option value="GA">Gabon</option>
+        <option value="GM">Gambia</option>
+        <option value="GE">Georgia</option>
+        <option value="GH">Ghana</option>
+        <option value="GI">Gibraltar</option>
+        <option value="GR">Greece</option>
+        <option value="GL">Greenland</option>
+        <option value="GD">Grenada</option>
+        <option value="GP">Guadeloupe</option>
+        <option value="GU">Guam</option>
+        <option value="GT">Guatemala</option>
+        <option value="GG">Guernsey</option>
+        <option value="GN">Guinea</option>
+        <option value="GW">Guinea-Bissau</option>
+        <option value="GY">Guyana</option>
+        <option value="HT">Haiti</option>
+        <option value="HM">Heard Island and McDonald Islands</option>
+        <option value="VA">Holy See (Vatican City State)</option>
+        <option value="HN">Honduras</option>
+        <option value="HK">Hong Kong</option>
+        <option value="HU">Hungary</option>
+        <option value="IS">Iceland</option>
+        <option value="ID">Indonesia</option>
+        <option value="IR">Iran, Islamic Republic of</option>
+        <option value="IQ">Iraq</option>
+        <option value="IE">Ireland</option>
+        <option value="IM">Isle of Man</option>
+        <option value="IL">Israel</option>
+        <option value="IT">Italy</option>
+        <option value="JM">Jamaica</option>
+        <option value="JP">Japan</option>
+        <option value="JE">Jersey</option>
+        <option value="JO">Jordan</option>
+        <option value="KZ">Kazakhstan</option>
+        <option value="KE">Kenya</option>
+        <option value="KI">Kiribati</option>
+        <option value="KP">Korea, Democratic People's Republic of</option>
+        <option value="KR">Korea, Republic of</option>
+        <option value="KW">Kuwait</option>
+        <option value="KG">Kyrgyzstan</option>
+        <option value="LA">Lao People's Democratic Republic</option>
+        <option value="LV">Latvia</option>
+        <option value="LB">Lebanon</option>
+        <option value="LS">Lesotho</option>
+        <option value="LR">Liberia</option>
+        <option value="LY">Libya</option>
+        <option value="LI">Liechtenstein</option>
+        <option value="LT">Lithuania</option>
+        <option value="LU">Luxembourg</option>
+        <option value="MO">Macao</option>
+        <option value="MK">Macedonia, the former Yugoslav Republic of</option>
+        <option value="MG">Madagascar</option>
+        <option value="MW">Malawi</option>
+        <option value="MY">Malaysia</option>
+        <option value="MV">Maldives</option>
+        <option value="ML">Mali</option>
+        <option value="MT">Malta</option>
+        <option value="MH">Marshall Islands</option>
+        <option value="MQ">Martinique</option>
+        <option value="MR">Mauritania</option>
+        <option value="MU">Mauritius</option>
+        <option value="YT">Mayotte</option>
+        <option value="MX">Mexico</option>
+        <option value="FM">Micronesia, Federated States of</option>
+        <option value="MD">Moldova, Republic of</option>
+        <option value="MC">Monaco</option>
+        <option value="MN">Mongolia</option>
+        <option value="ME">Montenegro</option>
+        <option value="MS">Montserrat</option>
+        <option value="MA">Morocco</option>
+        <option value="MZ">Mozambique</option>
+        <option value="MM">Myanmar</option>
+        <option value="NA">Namibia</option>
+        <option value="NR">Nauru</option>
+        <option value="NP">Nepal</option>
+        <option value="NL">Netherlands</option>
+        <option value="NC">New Caledonia</option>
+        <option value="NZ">New Zealand</option>
+        <option value="NI">Nicaragua</option>
+        <option value="NE">Niger</option>
+        <option value="NG">Nigeria</option>
+        <option value="NU">Niue</option>
+        <option value="NF">Norfolk Island</option>
+        <option value="MP">Northern Mariana Islands</option>
+        <option value="NO">Norway</option>
+        <option value="OM">Oman</option>
+        <option value="PK">Pakistan</option>
+        <option value="PW">Palau</option>
+        <option value="PS">Palestinian Territory, Occupied</option>
+        <option value="PA">Panama</option>
+        <option value="PG">Papua New Guinea</option>
+        <option value="PY">Paraguay</option>
+        <option value="PE">Peru</option>
+        <option value="PH">Philippines</option>
+        <option value="PN">Pitcairn</option>
+        <option value="PL">Poland</option>
+        <option value="PT">Portugal</option>
+        <option value="PR">Puerto Rico</option>
+        <option value="QA">Qatar</option>
+        <option value="RE">Réunion</option>
+        <option value="RO">Romania</option>
+        <option value="RU">Russian Federation</option>
+        <option value="RW">Rwanda</option>
+        <option value="BL">Saint Barthélemy</option>
+        <option value="SH">Saint Helena, Ascension and Tristan da Cunha</option>
+        <option value="KN">Saint Kitts and Nevis</option>
+        <option value="LC">Saint Lucia</option>
+        <option value="MF">Saint Martin (French part)</option>
+        <option value="PM">Saint Pierre and Miquelon</option>
+        <option value="VC">Saint Vincent and the Grenadines</option>
+        <option value="WS">Samoa</option>
+        <option value="SM">San Marino</option>
+        <option value="ST">Sao Tome and Principe</option>
+        <option value="SA">Saudi Arabia</option>
+        <option value="SN">Senegal</option>
+        <option value="RS">Serbia</option>
+        <option value="SC">Seychelles</option>
+        <option value="SL">Sierra Leone</option>
+        <option value="SG">Singapore</option>
+        <option value="SX">Sint Maarten (Dutch part)</option>
+        <option value="SK">Slovakia</option>
+        <option value="SI">Slovenia</option>
+        <option value="SB">Solomon Islands</option>
+        <option value="SO">Somalia</option>
+        <option value="ZA">South Africa</option>
+        <option value="GS">South Georgia and the South Sandwich Islands</option>
+        <option value="SS">South Sudan</option>
+        <option value="ES">Spain</option>
+        <option value="LK">Sri Lanka</option>
+        <option value="SD">Sudan</option>
+        <option value="SR">Suriname</option>
+        <option value="SJ">Svalbard and Jan Mayen</option>
+        <option value="SZ">Swaziland</option>
+        <option value="SE">Sweden</option>
+        <option value="CH">Switzerland</option>
+        <option value="SY">Syrian Arab Republic</option>
+        <option value="TW">Taiwan</option>
+        <option value="TJ">Tajikistan</option>
+        <option value="TZ">Tanzania, United Republic of</option>
+        <option value="TH">Thailand</option>
+        <option value="TL">Timor-Leste</option>
+        <option value="TG">Togo</option>
+        <option value="TK">Tokelau</option>
+        <option value="TO">Tonga</option>
+        <option value="TT">Trinidad and Tobago</option>
+        <option value="TN">Tunisia</option>
+        <option value="TR">Turkey</option>
+        <option value="TM">Turkmenistan</option>
+        <option value="TC">Turks and Caicos Islands</option>
+        <option value="TV">Tuvalu</option>
+        <option value="UG">Uganda</option>
+        <option value="UA">Ukraine</option>
+        <option value="AE">United Arab Emirates</option>
+        <option value="UM">United States Minor Outlying Islands</option>
+        <option value="UY">Uruguay</option>
+        <option value="UZ">Uzbekistan</option>
+        <option value="VU">Vanuatu</option>
+        <option value="VE">Venezuela, Bolivarian Republic of</option>
+        <option value="VN">Viet Nam</option>
+        <option value="VG">Virgin Islands, British</option>
+        <option value="VI">Virgin Islands, U.S.</option>
+        <option value="WF">Wallis and Futuna</option>
+        <option value="EH">Western Sahara</option>
+        <option value="YE">Yemen</option>
+        <option value="ZM">Zambia</option>
+        <option value="ZW">Zimbabwe</option>
+      </select>
     </div>
   </div>
-  <div class="tw-grid tw-grid-cols-12 tw-gap-4" *ngIf="showTaxIdFields">
-    <div class="tw-col-span-6">
-      <bit-form-field>
-        <bit-label>{{ "taxIdNumber" | i18n }}</bit-label>
-        <input bitInput type="text" formControlName="taxId" />
-      </bit-form-field>
+  <div [ngClass]="trialFlow ? 'col-5' : 'col-3'">
+    <div class="form-group">
+      <label for="addressPostalCode">{{ "zipPostalCode" | i18n }}</label>
+      <input
+        id="addressPostalCode"
+        class="form-control"
+        type="text"
+        name="addressPostalCode"
+        [(ngModel)]="taxInfo.postalCode"
+        [required]="taxInfo.country === 'US'"
+        autocomplete="postal-code"
+      />
     </div>
   </div>
-  <div class="tw-grid tw-grid-cols-12 tw-gap-4" *ngIf="showTaxIdFields">
-    <div class="tw-col-span-6">
-      <bit-form-field>
-        <bit-label>{{ "address1" | i18n }}</bit-label>
-        <input bitInput type="text" formControlName="line1" autocomplete="address-line1" />
-      </bit-form-field>
-    </div>
-    <div class="tw-col-span-6">
-      <bit-form-field>
-        <bit-label>{{ "address2" | i18n }}</bit-label>
-        <input bitInput type="text" formControlName="line2" autocomplete="address-line2" />
-      </bit-form-field>
-    </div>
-    <div class="tw-col-span-6">
-      <bit-form-field>
-        <bit-label for="addressCity">{{ "cityTown" | i18n }}</bit-label>
-        <input bitInput type="text" formControlName="city" autocomplete="address-level2" />
-      </bit-form-field>
-    </div>
-    <div class="tw-col-span-6">
-      <bit-form-field>
-        <bit-label>{{ "stateProvince" | i18n }}</bit-label>
-        <input bitInput type="text" formControlName="state" autocomplete="address-level1" />
-      </bit-form-field>
+  <div class="col-6" *ngIf="showTaxIdCheckbox">
+    <div class="form-group form-check">
+      <input
+        class="form-check-input"
+        id="addressIncludeTaxId"
+        name="addressIncludeTaxId"
+        type="checkbox"
+        [(ngModel)]="taxInfo.includeTaxId"
+      />
+      <label class="form-check-label" for="addressIncludeTaxId">{{ "includeVAT" | i18n }}</label>
     </div>
   </div>
-</form>
+</div>
+<div class="row" *ngIf="showTaxIdFields">
+  <div class="col-6">
+    <div class="form-group">
+      <label for="taxId">{{ "taxIdNumber" | i18n }}</label>
+      <input
+        id="taxId"
+        class="form-control"
+        type="text"
+        name="taxId"
+        [(ngModel)]="taxInfo.taxId"
+        [required]="taxInfo.includeTaxId"
+      />
+    </div>
+  </div>
+</div>
+<div class="row" *ngIf="showTaxIdFields">
+  <div class="col-6">
+    <div class="form-group">
+      <label for="addressLine1">{{ "address1" | i18n }}</label>
+      <input
+        id="addressLine1"
+        class="form-control"
+        type="text"
+        name="addressLine1"
+        [(ngModel)]="taxInfo.line1"
+        autocomplete="address-line1"
+      />
+    </div>
+  </div>
+  <div class="col-6">
+    <div class="form-group">
+      <label for="addressLine2">{{ "address2" | i18n }}</label>
+      <input
+        id="addressLine2"
+        class="form-control"
+        type="text"
+        name="addressLine2"
+        [(ngModel)]="taxInfo.line2"
+        autocomplete="address-line2"
+      />
+    </div>
+  </div>
+  <div class="col-6">
+    <div class="form-group">
+      <label for="addressCity">{{ "cityTown" | i18n }}</label>
+      <input
+        id="addressCity"
+        class="form-control"
+        type="text"
+        name="addressCity"
+        [(ngModel)]="taxInfo.city"
+        autocomplete="address-level2"
+      />
+    </div>
+  </div>
+  <div class="col-6">
+    <div class="form-group">
+      <label for="addressState">{{ "stateProvince" | i18n }}</label>
+      <input
+        id="addressState"
+        class="form-control"
+        type="text"
+        name="addressState"
+        [(ngModel)]="taxInfo.state"
+        autocomplete="address-level1"
+      />
+    </div>
+  </div>
+</div>
diff --git a/apps/web/src/app/billing/shared/tax-info.component.ts b/apps/web/src/app/billing/shared/tax-info.component.ts
index f50a82d6ed..a704c86eb5 100644
--- a/apps/web/src/app/billing/shared/tax-info.component.ts
+++ b/apps/web/src/app/billing/shared/tax-info.component.ts
@@ -1,7 +1,5 @@
 import { Component, EventEmitter, Input, Output } from "@angular/core";
-import { FormControl, FormGroup, Validators } from "@angular/forms";
 import { ActivatedRoute } from "@angular/router";
-import { Subject, takeUntil } from "rxjs";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
@@ -17,11 +15,6 @@ type TaxInfoView = Omit<TaxInfoResponse, "taxIdType"> & {
   includeTaxId: boolean;
   [key: string]: unknown;
 };
-type CountryList = {
-  name: string;
-  value: string;
-  disabled: boolean;
-};
 
 @Component({
   selector: "app-tax-info",
@@ -33,18 +26,6 @@ type CountryList = {
 export class TaxInfoComponent {
   @Input() trialFlow = false;
   @Output() onCountryChanged = new EventEmitter();
-  private destroy$ = new Subject<void>();
-
-  taxFormGroup = new FormGroup({
-    country: new FormControl(null, [Validators.required]),
-    postalCode: new FormControl(null),
-    includeTaxId: new FormControl(null),
-    taxId: new FormControl(null),
-    line1: new FormControl(null),
-    line2: new FormControl(null),
-    city: new FormControl(null),
-    state: new FormControl(null),
-  });
 
   loading = true;
   organizationId: string;
@@ -59,261 +40,20 @@ export class TaxInfoComponent {
     country: "US",
     includeTaxId: false,
   };
-  countryList: CountryList[] = [
-    { name: "-- Select --", value: "", disabled: false },
-    { name: "United States", value: "US", disabled: false },
-    { name: "China", value: "CN", disabled: false },
-    { name: "France", value: "FR", disabled: false },
-    { name: "Germany", value: "DE", disabled: false },
-    { name: "Canada", value: "CA", disabled: false },
-    { name: "United Kingdom", value: "GB", disabled: false },
-    { name: "Australia", value: "AU", disabled: false },
-    { name: "India", value: "IN", disabled: false },
-    { name: "", value: "-", disabled: true },
-    { name: "Afghanistan", value: "AF", disabled: false },
-    { name: "Åland Islands", value: "AX", disabled: false },
-    { name: "Albania", value: "AL", disabled: false },
-    { name: "Algeria", value: "DZ", disabled: false },
-    { name: "American Samoa", value: "AS", disabled: false },
-    { name: "Andorra", value: "AD", disabled: false },
-    { name: "Angola", value: "AO", disabled: false },
-    { name: "Anguilla", value: "AI", disabled: false },
-    { name: "Antarctica", value: "AQ", disabled: false },
-    { name: "Antigua and Barbuda", value: "AG", disabled: false },
-    { name: "Argentina", value: "AR", disabled: false },
-    { name: "Armenia", value: "AM", disabled: false },
-    { name: "Aruba", value: "AW", disabled: false },
-    { name: "Austria", value: "AT", disabled: false },
-    { name: "Azerbaijan", value: "AZ", disabled: false },
-    { name: "Bahamas", value: "BS", disabled: false },
-    { name: "Bahrain", value: "BH", disabled: false },
-    { name: "Bangladesh", value: "BD", disabled: false },
-    { name: "Barbados", value: "BB", disabled: false },
-    { name: "Belarus", value: "BY", disabled: false },
-    { name: "Belgium", value: "BE", disabled: false },
-    { name: "Belize", value: "BZ", disabled: false },
-    { name: "Benin", value: "BJ", disabled: false },
-    { name: "Bermuda", value: "BM", disabled: false },
-    { name: "Bhutan", value: "BT", disabled: false },
-    { name: "Bolivia, Plurinational State of", value: "BO", disabled: false },
-    { name: "Bonaire, Sint Eustatius and Saba", value: "BQ", disabled: false },
-    { name: "Bosnia and Herzegovina", value: "BA", disabled: false },
-    { name: "Botswana", value: "BW", disabled: false },
-    { name: "Bouvet Island", value: "BV", disabled: false },
-    { name: "Brazil", value: "BR", disabled: false },
-    { name: "British Indian Ocean Territory", value: "IO", disabled: false },
-    { name: "Brunei Darussalam", value: "BN", disabled: false },
-    { name: "Bulgaria", value: "BG", disabled: false },
-    { name: "Burkina Faso", value: "BF", disabled: false },
-    { name: "Burundi", value: "BI", disabled: false },
-    { name: "Cambodia", value: "KH", disabled: false },
-    { name: "Cameroon", value: "CM", disabled: false },
-    { name: "Cape Verde", value: "CV", disabled: false },
-    { name: "Cayman Islands", value: "KY", disabled: false },
-    { name: "Central African Republic", value: "CF", disabled: false },
-    { name: "Chad", value: "TD", disabled: false },
-    { name: "Chile", value: "CL", disabled: false },
-    { name: "Christmas Island", value: "CX", disabled: false },
-    { name: "Cocos (Keeling) Islands", value: "CC", disabled: false },
-    { name: "Colombia", value: "CO", disabled: false },
-    { name: "Comoros", value: "KM", disabled: false },
-    { name: "Congo", value: "CG", disabled: false },
-    { name: "Congo, the Democratic Republic of the", value: "CD", disabled: false },
-    { name: "Cook Islands", value: "CK", disabled: false },
-    { name: "Costa Rica", value: "CR", disabled: false },
-    { name: "Côte d'Ivoire", value: "CI", disabled: false },
-    { name: "Croatia", value: "HR", disabled: false },
-    { name: "Cuba", value: "CU", disabled: false },
-    { name: "Curaçao", value: "CW", disabled: false },
-    { name: "Cyprus", value: "CY", disabled: false },
-    { name: "Czech Republic", value: "CZ", disabled: false },
-    { name: "Denmark", value: "DK", disabled: false },
-    { name: "Djibouti", value: "DJ", disabled: false },
-    { name: "Dominica", value: "DM", disabled: false },
-    { name: "Dominican Republic", value: "DO", disabled: false },
-    { name: "Ecuador", value: "EC", disabled: false },
-    { name: "Egypt", value: "EG", disabled: false },
-    { name: "El Salvador", value: "SV", disabled: false },
-    { name: "Equatorial Guinea", value: "GQ", disabled: false },
-    { name: "Eritrea", value: "ER", disabled: false },
-    { name: "Estonia", value: "EE", disabled: false },
-    { name: "Ethiopia", value: "ET", disabled: false },
-    { name: "Falkland Islands (Malvinas)", value: "FK", disabled: false },
-    { name: "Faroe Islands", value: "FO", disabled: false },
-    { name: "Fiji", value: "FJ", disabled: false },
-    { name: "Finland", value: "FI", disabled: false },
-    { name: "French Guiana", value: "GF", disabled: false },
-    { name: "French Polynesia", value: "PF", disabled: false },
-    { name: "French Southern Territories", value: "TF", disabled: false },
-    { name: "Gabon", value: "GA", disabled: false },
-    { name: "Gambia", value: "GM", disabled: false },
-    { name: "Georgia", value: "GE", disabled: false },
-    { name: "Ghana", value: "GH", disabled: false },
-    { name: "Gibraltar", value: "GI", disabled: false },
-    { name: "Greece", value: "GR", disabled: false },
-    { name: "Greenland", value: "GL", disabled: false },
-    { name: "Grenada", value: "GD", disabled: false },
-    { name: "Guadeloupe", value: "GP", disabled: false },
-    { name: "Guam", value: "GU", disabled: false },
-    { name: "Guatemala", value: "GT", disabled: false },
-    { name: "Guernsey", value: "GG", disabled: false },
-    { name: "Guinea", value: "GN", disabled: false },
-    { name: "Guinea-Bissau", value: "GW", disabled: false },
-    { name: "Guyana", value: "GY", disabled: false },
-    { name: "Haiti", value: "HT", disabled: false },
-    { name: "Heard Island and McDonald Islands", value: "HM", disabled: false },
-    { name: "Holy See (Vatican City State)", value: "VA", disabled: false },
-    { name: "Honduras", value: "HN", disabled: false },
-    { name: "Hong Kong", value: "HK", disabled: false },
-    { name: "Hungary", value: "HU", disabled: false },
-    { name: "Iceland", value: "IS", disabled: false },
-    { name: "Indonesia", value: "ID", disabled: false },
-    { name: "Iran, Islamic Republic of", value: "IR", disabled: false },
-    { name: "Iraq", value: "IQ", disabled: false },
-    { name: "Ireland", value: "IE", disabled: false },
-    { name: "Isle of Man", value: "IM", disabled: false },
-    { name: "Israel", value: "IL", disabled: false },
-    { name: "Italy", value: "IT", disabled: false },
-    { name: "Jamaica", value: "JM", disabled: false },
-    { name: "Japan", value: "JP", disabled: false },
-    { name: "Jersey", value: "JE", disabled: false },
-    { name: "Jordan", value: "JO", disabled: false },
-    { name: "Kazakhstan", value: "KZ", disabled: false },
-    { name: "Kenya", value: "KE", disabled: false },
-    { name: "Kiribati", value: "KI", disabled: false },
-    { name: "Korea, Democratic People's Republic of", value: "KP", disabled: false },
-    { name: "Korea, Republic of", value: "KR", disabled: false },
-    { name: "Kuwait", value: "KW", disabled: false },
-    { name: "Kyrgyzstan", value: "KG", disabled: false },
-    { name: "Lao People's Democratic Republic", value: "LA", disabled: false },
-    { name: "Latvia", value: "LV", disabled: false },
-    { name: "Lebanon", value: "LB", disabled: false },
-    { name: "Lesotho", value: "LS", disabled: false },
-    { name: "Liberia", value: "LR", disabled: false },
-    { name: "Libya", value: "LY", disabled: false },
-    { name: "Liechtenstein", value: "LI", disabled: false },
-    { name: "Lithuania", value: "LT", disabled: false },
-    { name: "Luxembourg", value: "LU", disabled: false },
-    { name: "Macao", value: "MO", disabled: false },
-    { name: "Macedonia, the former Yugoslav Republic of", value: "MK", disabled: false },
-    { name: "Madagascar", value: "MG", disabled: false },
-    { name: "Malawi", value: "MW", disabled: false },
-    { name: "Malaysia", value: "MY", disabled: false },
-    { name: "Maldives", value: "MV", disabled: false },
-    { name: "Mali", value: "ML", disabled: false },
-    { name: "Malta", value: "MT", disabled: false },
-    { name: "Marshall Islands", value: "MH", disabled: false },
-    { name: "Martinique", value: "MQ", disabled: false },
-    { name: "Mauritania", value: "MR", disabled: false },
-    { name: "Mauritius", value: "MU", disabled: false },
-    { name: "Mayotte", value: "YT", disabled: false },
-    { name: "Mexico", value: "MX", disabled: false },
-    { name: "Micronesia, Federated States of", value: "FM", disabled: false },
-    { name: "Moldova, Republic of", value: "MD", disabled: false },
-    { name: "Monaco", value: "MC", disabled: false },
-    { name: "Mongolia", value: "MN", disabled: false },
-    { name: "Montenegro", value: "ME", disabled: false },
-    { name: "Montserrat", value: "MS", disabled: false },
-    { name: "Morocco", value: "MA", disabled: false },
-    { name: "Mozambique", value: "MZ", disabled: false },
-    { name: "Myanmar", value: "MM", disabled: false },
-    { name: "Namibia", value: "NA", disabled: false },
-    { name: "Nauru", value: "NR", disabled: false },
-    { name: "Nepal", value: "NP", disabled: false },
-    { name: "Netherlands", value: "NL", disabled: false },
-    { name: "New Caledonia", value: "NC", disabled: false },
-    { name: "New Zealand", value: "NZ", disabled: false },
-    { name: "Nicaragua", value: "NI", disabled: false },
-    { name: "Niger", value: "NE", disabled: false },
-    { name: "Nigeria", value: "NG", disabled: false },
-    { name: "Niue", value: "NU", disabled: false },
-    { name: "Norfolk Island", value: "NF", disabled: false },
-    { name: "Northern Mariana Islands", value: "MP", disabled: false },
-    { name: "Norway", value: "NO", disabled: false },
-    { name: "Oman", value: "OM", disabled: false },
-    { name: "Pakistan", value: "PK", disabled: false },
-    { name: "Palau", value: "PW", disabled: false },
-    { name: "Palestinian Territory, Occupied", value: "PS", disabled: false },
-    { name: "Panama", value: "PA", disabled: false },
-    { name: "Papua New Guinea", value: "PG", disabled: false },
-    { name: "Paraguay", value: "PY", disabled: false },
-    { name: "Peru", value: "PE", disabled: false },
-    { name: "Philippines", value: "PH", disabled: false },
-    { name: "Pitcairn", value: "PN", disabled: false },
-    { name: "Poland", value: "PL", disabled: false },
-    { name: "Portugal", value: "PT", disabled: false },
-    { name: "Puerto Rico", value: "PR", disabled: false },
-    { name: "Qatar", value: "QA", disabled: false },
-    { name: "Réunion", value: "RE", disabled: false },
-    { name: "Romania", value: "RO", disabled: false },
-    { name: "Russian Federation", value: "RU", disabled: false },
-    { name: "Rwanda", value: "RW", disabled: false },
-    { name: "Saint Barthélemy", value: "BL", disabled: false },
-    { name: "Saint Helena, Ascension and Tristan da Cunha", value: "SH", disabled: false },
-    { name: "Saint Kitts and Nevis", value: "KN", disabled: false },
-    { name: "Saint Lucia", value: "LC", disabled: false },
-    { name: "Saint Martin (French part)", value: "MF", disabled: false },
-    { name: "Saint Pierre and Miquelon", value: "PM", disabled: false },
-    { name: "Saint Vincent and the Grenadines", value: "VC", disabled: false },
-    { name: "Samoa", value: "WS", disabled: false },
-    { name: "San Marino", value: "SM", disabled: false },
-    { name: "Sao Tome and Principe", value: "ST", disabled: false },
-    { name: "Saudi Arabia", value: "SA", disabled: false },
-    { name: "Senegal", value: "SN", disabled: false },
-    { name: "Serbia", value: "RS", disabled: false },
-    { name: "Seychelles", value: "SC", disabled: false },
-    { name: "Sierra Leone", value: "SL", disabled: false },
-    { name: "Singapore", value: "SG", disabled: false },
-    { name: "Sint Maarten (Dutch part)", value: "SX", disabled: false },
-    { name: "Slovakia", value: "SK", disabled: false },
-    { name: "Slovenia", value: "SI", disabled: false },
-    { name: "Solomon Islands", value: "SB", disabled: false },
-    { name: "Somalia", value: "SO", disabled: false },
-    { name: "South Africa", value: "ZA", disabled: false },
-    { name: "South Georgia and the South Sandwich Islands", value: "GS", disabled: false },
-    { name: "South Sudan", value: "SS", disabled: false },
-    { name: "Spain", value: "ES", disabled: false },
-    { name: "Sri Lanka", value: "LK", disabled: false },
-    { name: "Sudan", value: "SD", disabled: false },
-    { name: "Suriname", value: "SR", disabled: false },
-    { name: "Svalbard and Jan Mayen", value: "SJ", disabled: false },
-    { name: "Swaziland", value: "SZ", disabled: false },
-    { name: "Sweden", value: "SE", disabled: false },
-    { name: "Switzerland", value: "CH", disabled: false },
-    { name: "Syrian Arab Republic", value: "SY", disabled: false },
-    { name: "Taiwan", value: "TW", disabled: false },
-    { name: "Tajikistan", value: "TJ", disabled: false },
-    { name: "Tanzania, United Republic of", value: "TZ", disabled: false },
-    { name: "Thailand", value: "TH", disabled: false },
-    { name: "Timor-Leste", value: "TL", disabled: false },
-    { name: "Togo", value: "TG", disabled: false },
-    { name: "Tokelau", value: "TK", disabled: false },
-    { name: "Tonga", value: "TO", disabled: false },
-    { name: "Trinidad and Tobago", value: "TT", disabled: false },
-    { name: "Tunisia", value: "TN", disabled: false },
-    { name: "Turkey", value: "TR", disabled: false },
-    { name: "Turkmenistan", value: "TM", disabled: false },
-    { name: "Turks and Caicos Islands", value: "TC", disabled: false },
-    { name: "Tuvalu", value: "TV", disabled: false },
-    { name: "Uganda", value: "UG", disabled: false },
-    { name: "Ukraine", value: "UA", disabled: false },
-    { name: "United Arab Emirates", value: "AE", disabled: false },
-    { name: "United States Minor Outlying Islands", value: "UM", disabled: false },
-    { name: "Uruguay", value: "UY", disabled: false },
-    { name: "Uzbekistan", value: "UZ", disabled: false },
-    { name: "Vanuatu", value: "VU", disabled: false },
-    { name: "Venezuela, Bolivarian Republic of", value: "VE", disabled: false },
-    { name: "Viet Nam", value: "VN", disabled: false },
-    { name: "Virgin Islands, British", value: "VG", disabled: false },
-    { name: "Virgin Islands, U.S.", value: "VI", disabled: false },
-    { name: "Wallis and Futuna", value: "WF", disabled: false },
-    { name: "Western Sahara", value: "EH", disabled: false },
-    { name: "Yemen", value: "YE", disabled: false },
-    { name: "Zambia", value: "ZM", disabled: false },
-    { name: "Zimbabwe", value: "ZW", disabled: false },
-  ];
+
   taxRates: TaxRateResponse[];
 
+  private pristine: TaxInfoView = {
+    taxId: null,
+    line1: null,
+    line2: null,
+    city: null,
+    state: null,
+    postalCode: null,
+    country: "US",
+    includeTaxId: false,
+  };
+
   constructor(
     private apiService: ApiService,
     private route: ActivatedRoute,
@@ -321,70 +61,6 @@ export class TaxInfoComponent {
     private organizationApiService: OrganizationApiServiceAbstraction,
   ) {}
 
-  get country(): string {
-    return this.taxFormGroup.get("country").value;
-  }
-
-  set country(country: string) {
-    this.taxFormGroup.get("country").setValue(country);
-  }
-
-  get postalCode(): string {
-    return this.taxFormGroup.get("postalCode").value;
-  }
-
-  set postalCode(postalCode: string) {
-    this.taxFormGroup.get("postalCode").setValue(postalCode);
-  }
-
-  get includeTaxId(): boolean {
-    return this.taxFormGroup.get("includeTaxId").value;
-  }
-
-  set includeTaxId(includeTaxId: boolean) {
-    this.taxFormGroup.get("includeTaxId").setValue(includeTaxId);
-  }
-
-  get taxId(): string {
-    return this.taxFormGroup.get("taxId").value;
-  }
-
-  set taxId(taxId: string) {
-    this.taxFormGroup.get("taxId").setValue(taxId);
-  }
-
-  get line1(): string {
-    return this.taxFormGroup.get("line1").value;
-  }
-
-  set line1(line1: string) {
-    this.taxFormGroup.get("line1").setValue(line1);
-  }
-
-  get line2(): string {
-    return this.taxFormGroup.get("line2").value;
-  }
-
-  set line2(line2: string) {
-    this.taxFormGroup.get("line2").setValue(line2);
-  }
-
-  get city(): string {
-    return this.taxFormGroup.get("city").value;
-  }
-
-  set city(city: string) {
-    this.taxFormGroup.get("city").setValue(city);
-  }
-
-  get state(): string {
-    return this.taxFormGroup.get("state").value;
-  }
-
-  set state(state: string) {
-    this.taxFormGroup.get("state").setValue(state);
-  }
-
   async ngOnInit() {
     // Provider setup
     // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
@@ -399,22 +75,21 @@ export class TaxInfoComponent {
         try {
           const taxInfo = await this.organizationApiService.getTaxInfo(this.organizationId);
           if (taxInfo) {
-            this.taxId = taxInfo.taxId;
-            this.state = taxInfo.state;
-            this.line1 = taxInfo.line1;
-            this.line2 = taxInfo.line2;
-            this.city = taxInfo.city;
-            this.state = taxInfo.state;
-            this.postalCode = taxInfo.postalCode;
-            this.country = taxInfo.country || "US";
-            this.includeTaxId =
-              this.countrySupportsTax(this.country) &&
+            this.taxInfo.taxId = taxInfo.taxId;
+            this.taxInfo.state = taxInfo.state;
+            this.taxInfo.line1 = taxInfo.line1;
+            this.taxInfo.line2 = taxInfo.line2;
+            this.taxInfo.city = taxInfo.city;
+            this.taxInfo.state = taxInfo.state;
+            this.taxInfo.postalCode = taxInfo.postalCode;
+            this.taxInfo.country = taxInfo.country || "US";
+            this.taxInfo.includeTaxId =
+              this.countrySupportsTax(this.taxInfo.country) &&
               (!!taxInfo.taxId ||
                 !!taxInfo.line1 ||
                 !!taxInfo.line2 ||
                 !!taxInfo.city ||
                 !!taxInfo.state);
-            this.setTaxInfoObject();
           }
         } catch (e) {
           this.logService.error(e);
@@ -423,40 +98,20 @@ export class TaxInfoComponent {
         try {
           const taxInfo = await this.apiService.getTaxInfo();
           if (taxInfo) {
-            this.postalCode = taxInfo.postalCode;
-            this.country = taxInfo.country || "US";
+            this.taxInfo.postalCode = taxInfo.postalCode;
+            this.taxInfo.country = taxInfo.country || "US";
           }
-          this.setTaxInfoObject();
         } catch (e) {
           this.logService.error(e);
         }
       }
-
-      if (this.country === "US") {
-        this.taxFormGroup.get("postalCode").setValidators([Validators.required]);
-        this.taxFormGroup.get("postalCode").updateValueAndValidity();
-      }
-
+      this.pristine = Object.assign({}, this.taxInfo);
       // If not the default (US) then trigger onCountryChanged
-      if (this.country !== "US") {
+      if (this.taxInfo.country !== "US") {
         this.onCountryChanged.emit();
       }
     });
 
-    this.taxFormGroup
-      .get("country")
-      .valueChanges.pipe(takeUntil(this.destroy$))
-      .subscribe((value) => {
-        if (value === "US") {
-          this.taxFormGroup.get("postalCode").setValidators([Validators.required]);
-        } else {
-          this.taxFormGroup.get("postalCode").clearValidators();
-        }
-        this.taxFormGroup.get("postalCode").updateValueAndValidity();
-        this.setTaxInfoObject();
-        this.changeCountry();
-      });
-
     try {
       const taxRates = await this.apiService.getTaxRates();
       if (taxRates) {
@@ -472,27 +127,16 @@ export class TaxInfoComponent {
   get taxRate() {
     if (this.taxRates != null) {
       const localTaxRate = this.taxRates.find(
-        (x) => x.country === this.country && x.postalCode === this.postalCode,
+        (x) => x.country === this.taxInfo.country && x.postalCode === this.taxInfo.postalCode,
       );
       return localTaxRate?.rate ?? null;
     }
   }
 
-  setTaxInfoObject() {
-    this.taxInfo.country = this.country;
-    this.taxInfo.postalCode = this.postalCode;
-    this.taxInfo.includeTaxId = this.includeTaxId;
-    this.taxInfo.taxId = this.taxId;
-    this.taxInfo.line1 = this.line1;
-    this.taxInfo.line2 = this.line2;
-    this.taxInfo.city = this.city;
-    this.taxInfo.state = this.state;
-  }
-
   get showTaxIdCheckbox() {
     return (
       (this.organizationId || this.providerId) &&
-      this.country !== "US" &&
+      this.taxInfo.country !== "US" &&
       this.countrySupportsTax(this.taxInfo.country)
     );
   }
@@ -500,23 +144,23 @@ export class TaxInfoComponent {
   get showTaxIdFields() {
     return (
       (this.organizationId || this.providerId) &&
-      this.includeTaxId &&
-      this.countrySupportsTax(this.country)
+      this.taxInfo.includeTaxId &&
+      this.countrySupportsTax(this.taxInfo.country)
     );
   }
 
   getTaxInfoRequest(): TaxInfoUpdateRequest {
     if (this.organizationId || this.providerId) {
       const request = new ExpandedTaxInfoUpdateRequest();
-      request.country = this.country;
-      request.postalCode = this.postalCode;
+      request.country = this.taxInfo.country;
+      request.postalCode = this.taxInfo.postalCode;
 
-      if (this.includeTaxId) {
-        request.taxId = this.taxId;
-        request.line1 = this.line1;
-        request.line2 = this.line2;
-        request.city = this.city;
-        request.state = this.state;
+      if (this.taxInfo.includeTaxId) {
+        request.taxId = this.taxInfo.taxId;
+        request.line1 = this.taxInfo.line1;
+        request.line2 = this.taxInfo.line2;
+        request.city = this.taxInfo.city;
+        request.state = this.taxInfo.state;
       } else {
         request.taxId = null;
         request.line1 = null;
@@ -527,15 +171,18 @@ export class TaxInfoComponent {
       return request;
     } else {
       const request = new TaxInfoUpdateRequest();
-      request.postalCode = this.postalCode;
-      request.country = this.country;
+      request.postalCode = this.taxInfo.postalCode;
+      request.country = this.taxInfo.country;
       return request;
     }
   }
 
   submitTaxInfo(): Promise<any> {
-    this.taxFormGroup.updateValueAndValidity();
-    this.taxFormGroup.markAllAsTouched();
+    if (!this.hasChanged()) {
+      return new Promise<void>((resolve) => {
+        resolve();
+      });
+    }
     const request = this.getTaxInfoRequest();
     return this.organizationId
       ? this.organizationApiService.updateTaxInfo(
@@ -546,14 +193,13 @@ export class TaxInfoComponent {
   }
 
   changeCountry() {
-    if (!this.countrySupportsTax(this.country)) {
-      this.includeTaxId = false;
-      this.taxId = null;
-      this.line1 = null;
-      this.line2 = null;
-      this.city = null;
-      this.state = null;
-      this.setTaxInfoObject();
+    if (!this.countrySupportsTax(this.taxInfo.country)) {
+      this.taxInfo.includeTaxId = false;
+      this.taxInfo.taxId = null;
+      this.taxInfo.line1 = null;
+      this.taxInfo.line2 = null;
+      this.taxInfo.city = null;
+      this.taxInfo.state = null;
     }
     this.onCountryChanged.emit();
   }
@@ -562,6 +208,16 @@ export class TaxInfoComponent {
     return this.taxSupportedCountryCodes.includes(countryCode);
   }
 
+  private hasChanged(): boolean {
+    for (const key in this.taxInfo) {
+      // eslint-disable-next-line
+      if (this.pristine.hasOwnProperty(key) && this.pristine[key] !== this.taxInfo[key]) {
+        return true;
+      }
+    }
+    return false;
+  }
+
   private taxSupportedCountryCodes: string[] = [
     "CN",
     "FR",