diff --git a/packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersTypeStep/index.tsx b/packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersTypeStep/index.tsx
index 1b5e40fdaa..37251cc6af 100644
--- a/packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersTypeStep/index.tsx
+++ b/packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersTypeStep/index.tsx
@@ -98,23 +98,27 @@ const SelectUsersTypeStep = (props: TypeSelectProps) => {
   const showCancelDialog = () => setCancelUploadDialogVisible(true);
   const hideCancelDialog = () => setCancelUploadDialogVisible(false);
 
+  const Buttons = (
+    <MigrationButtons
+      className="save-cancel-buttons"
+      onSaveClick={incrementStep}
+      onCancelClick={decrementStep}
+      showReminder
+      saveButtonLabel={t("Settings:NextStep")}
+      cancelButtonLabel={t("Common:Back")}
+      displaySettings
+      migrationCancelLabel={t("Settings:CancelImport")}
+      onMigrationCancelClick={showCancelDialog}
+    />
+  );
+
   useEffect(() => {
     setDataPortion(filteredUsers.slice(...boundaries));
   }, [users]);
 
   return (
     <Wrapper>
-      <MigrationButtons
-        className="save-cancel-buttons upper-buttons"
-        onSaveClick={incrementStep}
-        onCancelClick={decrementStep}
-        showReminder
-        saveButtonLabel={t("Settings:NextStep")}
-        cancelButtonLabel={t("Common:Back")}
-        displaySettings
-        migrationCancelLabel={t("Settings:CancelImport")}
-        onMigrationCancelClick={showCancelDialog}
-      />
+      {Buttons}
 
       {filteredUsers.length > 0 && (
         <>
@@ -140,19 +144,7 @@ const SelectUsersTypeStep = (props: TypeSelectProps) => {
             />
           )}
 
-          {filteredAccounts.length > 0 && (
-            <MigrationButtons
-              className="save-cancel-buttons"
-              onSaveClick={incrementStep}
-              onCancelClick={decrementStep}
-              showReminder
-              saveButtonLabel={t("Settings:NextStep")}
-              cancelButtonLabel={t("Common:Back")}
-              displaySettings
-              migrationCancelLabel={t("Settings:CancelImport")}
-              onMigrationCancelClick={showCancelDialog}
-            />
-          )}
+          {filteredAccounts.length > 0 && Buttons}
         </>
       )}
 
diff --git a/packages/client/src/pages/PortalSettings/categories/data-import/sub-components/StepLayout.tsx b/packages/client/src/pages/PortalSettings/categories/data-import/sub-components/StepLayout.tsx
index ee471aa75b..3488f71353 100644
--- a/packages/client/src/pages/PortalSettings/categories/data-import/sub-components/StepLayout.tsx
+++ b/packages/client/src/pages/PortalSettings/categories/data-import/sub-components/StepLayout.tsx
@@ -39,7 +39,7 @@ const DescriptionWrapper = styled.div`
   }
 
   .data-import-section-description {
-    margin-bottom: 8px;
+    margin-bottom: 16px;
     font-size: 12px;
   }
 `;