diff --git a/app/javascript/react/screens/App/Settings/__tests__/__snapshots__/SettingsActions.test.js.snap b/app/javascript/react/screens/App/Settings/__tests__/__snapshots__/SettingsActions.test.js.snap
index c6f5957e2b..18c16f1a0e 100644
--- a/app/javascript/react/screens/App/Settings/__tests__/__snapshots__/SettingsActions.test.js.snap
+++ b/app/javascript/react/screens/App/Settings/__tests__/__snapshots__/SettingsActions.test.js.snap
@@ -77,6 +77,7 @@ Array [
         },
         "transformation": Object {
           "limits": Object {
+            "max_concurrent_tasks_per_ems": 10,
             "max_concurrent_tasks_per_host": 10,
           },
         },
@@ -113,6 +114,7 @@ Array [
         },
         "transformation": Object {
           "limits": Object {
+            "max_concurrent_tasks_per_ems": 10,
             "max_concurrent_tasks_per_host": 10,
           },
         },
diff --git a/app/javascript/react/screens/App/Settings/__tests__/__snapshots__/SettingsReducer.test.js.snap b/app/javascript/react/screens/App/Settings/__tests__/__snapshots__/SettingsReducer.test.js.snap
index 3e8e8f885f..47b9bc64a1 100644
--- a/app/javascript/react/screens/App/Settings/__tests__/__snapshots__/SettingsReducer.test.js.snap
+++ b/app/javascript/react/screens/App/Settings/__tests__/__snapshots__/SettingsReducer.test.js.snap
@@ -287,6 +287,7 @@ Object {
   "isSavingSettings": false,
   "postConversionHostsResults": Array [],
   "savedSettings": Object {
+    "max_concurrent_tasks_per_ems": 10,
     "max_concurrent_tasks_per_host": 10,
   },
   "savingSettingsRejected": false,
@@ -397,6 +398,7 @@ Object {
   "isSavingSettings": false,
   "postConversionHostsResults": Array [],
   "savedSettings": Object {
+    "max_concurrent_tasks_per_ems": 10,
     "max_concurrent_tasks_per_host": 10,
   },
   "savingSettingsRejected": false,
diff --git a/app/javascript/react/screens/App/Settings/screens/GeneralSettings/__tests__/__snapshots__/GeneralSettings.test.js.snap b/app/javascript/react/screens/App/Settings/screens/GeneralSettings/__tests__/__snapshots__/GeneralSettings.test.js.snap
index 03189be06d..b73703965b 100644
--- a/app/javascript/react/screens/App/Settings/screens/GeneralSettings/__tests__/__snapshots__/GeneralSettings.test.js.snap
+++ b/app/javascript/react/screens/App/Settings/screens/GeneralSettings/__tests__/__snapshots__/GeneralSettings.test.js.snap
@@ -18,6 +18,7 @@ exports[`GeneralSettings component renders the general settings page 1`] = `
   >
     <Form
       bsClass="form"
+      className="form-horizontal"
       componentClass="form"
       horizontal={false}
       inline={false}
@@ -27,21 +28,60 @@ exports[`GeneralSettings component renders the general settings page 1`] = `
         }
       }
     >
+      <div>
+        <h3>
+          Concurrent Migrations
+        </h3>
+      </div>
       <FormGroup
         bsClass="form-group"
       >
         <ControlLabel
           bsClass="control-label"
+          className="col-md-5"
           srOnly={false}
         >
-          Maximum concurrent migrations per conversion host
+          <span
+            className="pull-left"
+          >
+            Maximum concurrent migrations per conversion host
+            <OverlayTrigger
+              defaultOverlayShown={false}
+              delay={500}
+              overlay={
+                <Popover
+                  bsClass="popover"
+                  id="maximum_concurrect_migrations_per_provider_popover"
+                  placement="right"
+                >
+                  For VDDK transformations the maximum concurrent migrations per conversion host is limited to 20. See the product documentation for more information.
+                </Popover>
+              }
+              placement="top"
+              rootClose={false}
+              trigger={
+                Array [
+                  "hover",
+                ]
+              }
+            >
+              <Icon
+                name="info"
+                size="md"
+                style={
+                  Object {
+                    "backgroundColor": "transparent",
+                    "padding": 10,
+                    "width": "inherit",
+                  }
+                }
+                type="pf"
+              />
+            </OverlayTrigger>
+          </span>
         </ControlLabel>
         <div
-          style={
-            Object {
-              "width": 100,
-            }
-          }
+          className="col-md-2"
         >
           <Field
             component={[Function]}
@@ -49,11 +89,45 @@ exports[`GeneralSettings component renders the general settings page 1`] = `
             min={1}
             name="max_concurrent_tasks_per_host"
             normalize={[Function]}
+            onChange={[Function]}
+          />
+        </div>
+      </FormGroup>
+      <FormGroup
+        bsClass="form-group"
+      >
+        <ControlLabel
+          bsClass="control-label"
+          className="col-md-5"
+          srOnly={false}
+        >
+          <div
+            className="pull-left"
+          >
+            Maximum concurrent migrations per provider
+          </div>
+        </ControlLabel>
+        <div
+          className="col-md-2"
+        >
+          <Field
+            component={[Function]}
+            id="max_concurrent_tasks_per_ems"
+            min={1}
+            name="max_concurrent_tasks_per_ems"
+            normalize={[Function]}
+            onChange={[Function]}
           />
         </div>
       </FormGroup>
       <FormGroup
         bsClass="form-group"
+        className="col-md-1 pull-left"
+        style={
+          Object {
+            "marginTop": "40px",
+          }
+        }
       >
         <Button
           active={false}
@@ -65,7 +139,6 @@ exports[`GeneralSettings component renders the general settings page 1`] = `
         >
           Apply
         </Button>
-        <br />
       </FormGroup>
     </Form>
   </div>
diff --git a/app/javascript/react/screens/App/Settings/settings.fixures.js b/app/javascript/react/screens/App/Settings/settings.fixures.js
index b2adda7a44..a9eda02ae9 100644
--- a/app/javascript/react/screens/App/Settings/settings.fixures.js
+++ b/app/javascript/react/screens/App/Settings/settings.fixures.js
@@ -18,7 +18,8 @@ export const servers = Immutable({
 export const settings = Immutable({
   transformation: {
     limits: {
-      max_concurrent_tasks_per_host: 10
+      max_concurrent_tasks_per_host: 10,
+      max_concurrent_tasks_per_ems: 10
     }
   },
   otherSettings: {
@@ -27,7 +28,8 @@ export const settings = Immutable({
 });
 
 export const settingsFormValues = Immutable({
-  max_concurrent_tasks_per_host: 10
+  max_concurrent_tasks_per_host: 10,
+  max_concurrent_tasks_per_ems: 10
 });
 
 export const fetchServersData = {