diff --git a/extensions/azurePublish/src/components/azureProvisionDialog.tsx b/extensions/azurePublish/src/components/azureProvisionDialog.tsx
index d8751a7142..2499f6a6d5 100644
--- a/extensions/azurePublish/src/components/azureProvisionDialog.tsx
+++ b/extensions/azurePublish/src/components/azureProvisionDialog.tsx
@@ -451,10 +451,8 @@ export const AzureProvisionDialog: React.FC = () => {
 
   const getResources = async () => {
     try {
-      if (isMounted.current) {
-        const resources = await getResourceList(currentProjectId(), publishType);
-        setExtensionResourceOptions(resources);
-      }
+      const resources = await getResourceList(currentProjectId(), publishType);
+      setExtensionResourceOptions(resources);
     } catch (err) {
       // todo: how do we handle API errors in this component
       // eslint-disable-next-line no-console
@@ -462,6 +460,10 @@ export const AzureProvisionDialog: React.FC = () => {
     }
   };
 
+  useEffect(() => {
+    getResources();
+  }, [publishType]);
+
   useEffect(() => {
     if (token) {
       setSubscriptionsErrorMessage(undefined);
@@ -483,8 +485,6 @@ export const AzureProvisionDialog: React.FC = () => {
             setSubscriptionsErrorMessage(err.message);
           }
         });
-
-      getResources();
     }
   }, [token]);
 
@@ -683,7 +683,7 @@ export const AzureProvisionDialog: React.FC = () => {
       style={{ height: 'calc(100vh - 64px)' }}
     >
       <ChooseProvisionAction
-        choice="create"
+        choice={formData.creationType}
         onChoiceChanged={(choice) => {
           updateFormData('creationType', choice);
         }}
@@ -882,8 +882,10 @@ export const AzureProvisionDialog: React.FC = () => {
                   case 'import':
                     setPageAndTitle(PageTypes.EditJson);
                     break;
-                  case 'create':
                   case 'generate':
+                    onNext(formData.hostname);
+                    break;
+                  case 'create':
                   default:
                     setPageAndTitle(PageTypes.ConfigProvision);
                     break;
@@ -969,7 +971,11 @@ export const AzureProvisionDialog: React.FC = () => {
               style={{ margin: '0 4px' }}
               text={formatMessage('Back')}
               onClick={() => {
-                setPageAndTitle(PageTypes.ConfigProvision);
+                if (formData.creationType === 'generate') {
+                  setPageAndTitle(PageTypes.ChooseAction);
+                } else {
+                  setPageAndTitle(PageTypes.ConfigProvision);
+                }
               }}
             />
             <PrimaryButton