diff --git a/client/src/components/Applications/AppForm/AppForm.jsx b/client/src/components/Applications/AppForm/AppForm.jsx
index ddb106435..8535bf13f 100644
--- a/client/src/components/Applications/AppForm/AppForm.jsx
+++ b/client/src/components/Applications/AppForm/AppForm.jsx
@@ -152,7 +152,6 @@ const HandleDependentFieldChanges = ({ app, formStateUpdateHandler }) => {
   const { values, setValues } = useFormikContext();
   React.useEffect(() => {
     if (previousValues) {
-      let valueUpdated = false;
       let updatedValues = { ...values };
 
       // Set the current allocation
@@ -171,7 +170,6 @@ const HandleDependentFieldChanges = ({ app, formStateUpdateHandler }) => {
           updatedValues,
           formStateUpdateHandler
         );
-        valueUpdated = true;
       }
       if (previousValues.execSystemId !== values.execSystemId) {
         updatedValues = execSystemChangeHandler(
@@ -179,16 +177,16 @@ const HandleDependentFieldChanges = ({ app, formStateUpdateHandler }) => {
           values,
           formStateUpdateHandler
         );
-        valueUpdated = true;
       }
 
       if (
         previousValues.execSystemLogicalQueue !== values.execSystemLogicalQueue
       ) {
         updatedValues = updateValuesForQueue(app, values);
-        valueUpdated = true;
       }
-      if (valueUpdated) setValues(updatedValues);
+      if (JSON.stringify(updatedValues) !== JSON.stringify(values)) {
+        setValues(updatedValues);
+      }
     }
     setPreviousValues(values);
   }, [app, values, setValues, formStateUpdateHandler]);
@@ -926,6 +924,7 @@ export const AppSchemaForm = ({ app }) => {
                   ) : null}
                 </div>
                 <Button
+                  id="submit"
                   attr="submit"
                   size="medium"
                   type="primary"
@@ -936,6 +935,7 @@ export const AppSchemaForm = ({ app }) => {
                   Submit
                 </Button>
                 <Button
+                  id="reset"
                   onClick={handleReset}
                   className="btn-resetForm"
                   type="link"
diff --git a/client/src/components/_common/Form/FormField.jsx b/client/src/components/_common/Form/FormField.jsx
index 1e5dbc7a1..412d14dea 100644
--- a/client/src/components/_common/Form/FormField.jsx
+++ b/client/src/components/_common/Form/FormField.jsx
@@ -138,6 +138,7 @@ const FormField = ({
 
             <InputGroup>
               <Button
+                size="middle"
                 type="secondary"
                 onClick={() => setOpenTapisFileModal(true)}
               >