diff --git a/apps/storefront/src/pages/address/components/AddressForm.tsx b/apps/storefront/src/pages/address/components/AddressForm.tsx
index 936bfad8..42ee6b39 100644
--- a/apps/storefront/src/pages/address/components/AddressForm.tsx
+++ b/apps/storefront/src/pages/address/components/AddressForm.tsx
@@ -488,9 +488,18 @@ function AddressForm(
     const translatedAddressFields = JSON.parse(JSON.stringify(addressFields))
 
     translatedAddressFields.forEach(
-      (element: { label: string; idLang: string }) => {
+      (element: {
+        label: string
+        idLang: string
+        fieldId: string
+        default: string
+      }) => {
         element.label = b3Lang(element.idLang)
 
+        if (!isB2BUser && element.fieldId === 'field_21') {
+          element.default = ''
+        }
+
         return element
       }
     )
diff --git a/apps/storefront/src/pages/registered/Registered.tsx b/apps/storefront/src/pages/registered/Registered.tsx
index 555e55b7..c35a9799 100644
--- a/apps/storefront/src/pages/registered/Registered.tsx
+++ b/apps/storefront/src/pages/registered/Registered.tsx
@@ -159,6 +159,12 @@ function Registered(props: RegisteredProps) {
             ): Partial<RegisterFieldsItems> => {
               if (addressFields.name === 'country') {
                 addressFields.options = countries
+                const countryDefaultValue = countries.find(
+                  (country: CustomFieldItems) =>
+                    country.countryName === addressFields.default
+                )
+                addressFields.default =
+                  countryDefaultValue?.countryCode || addressFields.default
               }
               return addressFields
             }
diff --git a/apps/storefront/src/pages/registered/config.ts b/apps/storefront/src/pages/registered/config.ts
index 321a1ad0..c267892b 100644
--- a/apps/storefront/src/pages/registered/config.ts
+++ b/apps/storefront/src/pages/registered/config.ts
@@ -189,6 +189,10 @@ const classificationType = (item: CustomFieldItems) => {
     })
   }
 
+  if (item.fieldId === 'field_country') {
+    optionItems.default = item.valueConfigs?.default || optionItems.default
+  }
+
   return optionItems
 }