diff --git a/common/app/routes/Settings/formHelpers/Form.jsx b/common/app/routes/Settings/formHelpers/Form.jsx
index 54bfe34316..c41b47325a 100644
--- a/common/app/routes/Settings/formHelpers/Form.jsx
+++ b/common/app/routes/Settings/formHelpers/Form.jsx
@@ -48,6 +48,7 @@ function DynamicForm({
       <FormFields
         errors={ errors }
         fields={ fields }
+        formId={ id }
         options={ options }
       />
       {
diff --git a/common/app/routes/Settings/formHelpers/FormFields.jsx b/common/app/routes/Settings/formHelpers/FormFields.jsx
index d3c2c84927..f66c5f2945 100644
--- a/common/app/routes/Settings/formHelpers/FormFields.jsx
+++ b/common/app/routes/Settings/formHelpers/FormFields.jsx
@@ -19,6 +19,7 @@ const propTypes = {
       value: PropTypes.string.isRequired
     })
   ).isRequired,
+  formId: PropTypes.string,
   options: PropTypes.shape({
     errors: PropTypes.objectOf(
       PropTypes.oneOfType([
@@ -34,7 +35,7 @@ const propTypes = {
 };
 
 function FormFields(props) {
-  const { errors = {}, fields, options = {} } = props;
+  const { errors = {}, fields, formId, options = {} } = props;
   const {
     ignored = [],
     placeholder = true,
@@ -48,7 +49,9 @@ function FormFields(props) {
         .filter(field => !ignored.includes(field))
         .map(key => fields[key])
         .map(({ name, onChange, value, pristine }) => {
-          const key = _.kebabCase(name);
+          const key = formId ?
+            `${formId}_${_.kebabCase(name)}` :
+            _.kebabCase(name);
           const type = name in types ? types[name] : 'text';
           return (
           <Row className='inline-form-field' key={ key }>