diff --git a/frontend/src/components/Badge/Badge.tsx b/frontend/src/components/Badge/Badge.tsx
index d59edfec8f..29467673b3 100644
--- a/frontend/src/components/Badge/Badge.tsx
+++ b/frontend/src/components/Badge/Badge.tsx
@@ -10,7 +10,7 @@ export interface BadgeProps extends ChakraBadgeProps {
    * The theme of the tag to display
    */
   variant?: BadgeVariants
-  bgColor?: string
+  colorScheme?: string
 }
 
 export const Badge = (props: BadgeProps): JSX.Element => {
diff --git a/frontend/src/features/admin-form/create/logic/components/LogicContent/InactiveLogicBlock/FieldLogicBadge.tsx b/frontend/src/features/admin-form/create/logic/components/LogicContent/InactiveLogicBlock/FieldLogicBadge.tsx
index c9753e554c..9ce584bba6 100644
--- a/frontend/src/features/admin-form/create/logic/components/LogicContent/InactiveLogicBlock/FieldLogicBadge.tsx
+++ b/frontend/src/features/admin-form/create/logic/components/LogicContent/InactiveLogicBlock/FieldLogicBadge.tsx
@@ -44,10 +44,10 @@ export const FieldLogicBadge = ({
     }
   }, [defaults.variant, fieldMeta])
 
-  const badgeBgColor = useMemo(() => {
+  const badgeColorScheme = useMemo(() => {
     if (fieldMeta) return undefined
     if (defaults.variant === 'error') {
-      return 'danger.100'
+      return 'danger'
     }
     return undefined
   }, [defaults.variant, fieldMeta])
@@ -68,7 +68,7 @@ export const FieldLogicBadge = ({
   }, [defaults.variant, fieldMeta])
 
   return (
-    <LogicBadge display="inline-flex" bgColor={badgeBgColor}>
+    <LogicBadge display="inline-flex" colorScheme={badgeColorScheme}>
       <Stack direction="row" spacing="0.25rem" maxW="100%" align="center">
         <Tooltip placement="top" label={tooltipLabel}>
           <Box display="inline-flex" alignItems="center">
diff --git a/frontend/src/features/admin-form/create/workflow/components/WorkflowContent/EditStepBlock/EditStepBlock.tsx b/frontend/src/features/admin-form/create/workflow/components/WorkflowContent/EditStepBlock/EditStepBlock.tsx
index 30ac31b76f..80e66ed358 100644
--- a/frontend/src/features/admin-form/create/workflow/components/WorkflowContent/EditStepBlock/EditStepBlock.tsx
+++ b/frontend/src/features/admin-form/create/workflow/components/WorkflowContent/EditStepBlock/EditStepBlock.tsx
@@ -44,7 +44,7 @@ export const EditStepBlock = ({
     defaultValues,
   })
   const { user, isLoading: isUserLoading } = useUser()
-  isLoading = isLoading || isUserLoading
+  const _isLoading = isLoading || isUserLoading
 
   const wrapperRef = useRef<HTMLDivElement | null>(null)
 
@@ -138,10 +138,10 @@ export const EditStepBlock = ({
         user={user}
         stepNumber={stepNumber}
         formMethods={formMethods}
-        isLoading={isLoading}
+        isLoading={_isLoading}
       />
       <Divider />
-      <QuestionsBlock formMethods={formMethods} isLoading={isLoading} />
+      <QuestionsBlock formMethods={formMethods} isLoading={_isLoading} />
       {/*TODO: (MRF-email-notif) Remove isTest and betaFlag check when approvals is out of beta */}
       {isTest || user?.betaFlags?.mrfEmailNotifications ? (
         !isFirstStep ? (
@@ -153,7 +153,7 @@ export const EditStepBlock = ({
       ) : null}
       <Divider />
       <SaveActionGroup
-        isLoading={isLoading}
+        isLoading={_isLoading}
         handleSubmit={handleSubmit}
         handleDelete={isFirstStep ? undefined : handleOpenDeleteModal}
         handleCancel={setToInactive}
diff --git a/frontend/src/features/admin-form/create/workflow/components/WorkflowContent/EditStepBlock/RespondentBlock.tsx b/frontend/src/features/admin-form/create/workflow/components/WorkflowContent/EditStepBlock/RespondentBlock.tsx
index 58652b879a..09e00da403 100644
--- a/frontend/src/features/admin-form/create/workflow/components/WorkflowContent/EditStepBlock/RespondentBlock.tsx
+++ b/frontend/src/features/admin-form/create/workflow/components/WorkflowContent/EditStepBlock/RespondentBlock.tsx
@@ -56,7 +56,7 @@ const StaticRespondentOption = ({
         allowDeselect={false}
         value={WorkflowType.Static}
         {...register('workflow_type', WORKFLOW_TYPE_VALIDATION)}
-        px="8px"
+        px="0.5rem"
         __css={{
           _focusWithin: {
             boxShadow: 'none',
@@ -138,7 +138,7 @@ const DynamicRespondentOption = ({
         allowDeselect={false}
         value={WorkflowType.Dynamic}
         {...register('workflow_type', WORKFLOW_TYPE_VALIDATION)}
-        px="8px"
+        px="0.5rem"
         __css={{
           _focusWithin: {
             boxShadow: 'none',
@@ -289,32 +289,29 @@ export const RespondentBlock = ({
           )}
         </>
       ) : (
-        <>
-          <FormControl
-            isReadOnly={isLoading}
-            id="workflow_type"
-            isRequired
-            isInvalid={!!errors.workflow_type}
-          >
-            <FormLabel style={textStyles.h4}>Select a respondent</FormLabel>
-            <Stack spacing="0.25rem">
-              <Radio.RadioGroup value={selectedWorkflowType}>
-                <DynamicRespondentOption
-                  selectedWorkflowType={selectedWorkflowType}
-                  emailFieldItems={emailFieldItems}
-                  formMethods={formMethods}
-                  isLoading={isLoading}
-                />
-                <StaticRespondentOption
-                  selectedWorkflowType={selectedWorkflowType}
-                  formMethods={formMethods}
-                  isLoading={isLoading}
-                />
-              </Radio.RadioGroup>
-            </Stack>
-            <FormErrorMessage>{errors.workflow_type?.message}</FormErrorMessage>
-          </FormControl>
-        </>
+        <FormControl
+          isReadOnly={isLoading}
+          isRequired
+          isInvalid={!!errors.workflow_type}
+        >
+          <FormLabel style={textStyles.h4}>Select a respondent</FormLabel>
+          <Stack spacing="0.25rem">
+            <Radio.RadioGroup value={selectedWorkflowType}>
+              <DynamicRespondentOption
+                selectedWorkflowType={selectedWorkflowType}
+                emailFieldItems={emailFieldItems}
+                formMethods={formMethods}
+                isLoading={isLoading}
+              />
+              <StaticRespondentOption
+                selectedWorkflowType={selectedWorkflowType}
+                formMethods={formMethods}
+                isLoading={isLoading}
+              />
+            </Radio.RadioGroup>
+          </Stack>
+          <FormErrorMessage>{errors.workflow_type?.message}</FormErrorMessage>
+        </FormControl>
       )}
     </EditStepBlockContainer>
   )
diff --git a/src/app/modules/core/core.errors.ts b/src/app/modules/core/core.errors.ts
index 3df2d3e00f..2975a60b68 100644
--- a/src/app/modules/core/core.errors.ts
+++ b/src/app/modules/core/core.errors.ts
@@ -64,9 +64,9 @@ export enum ErrorCodes {
   SUBMISSION_MALICIOUS_FILE_DETECTED = 100220,
   SUBMISSION_INVALID_WORKFLOW_TYPE = 100221,
   SUBMISSION_ATTACHMENT_UPLOAD = 100222,
-  SUBMISSION_EXPECTED_RESPONSE_NOT_FOUND = 100223,
+  SUBMISSION_EXPECTED_RESPONSE_NOT_FOUND = 100224,
   // Email Submission Errors (email mode deprecated soon)
-  EMAIL_SUBMISSION_HASH = 100250,
+  EMAIL_SUBMISSION_HASH = 100223,
   // [100300 - 100399] Receiver Errors (/modules/submission/receiver)
   RECEIVER_INITIALISE_MULTIPART_RECEIVER = 100301,
   RECEIVER_MULTIPART_CONTENT_LIMIT = 100302,
diff --git a/src/app/modules/form/admin-form/admin-form.service.ts b/src/app/modules/form/admin-form/admin-form.service.ts
index 4dc606fac0..f7319d6d05 100644
--- a/src/app/modules/form/admin-form/admin-form.service.ts
+++ b/src/app/modules/form/admin-form/admin-form.service.ts
@@ -585,7 +585,7 @@ export const createForm = (
     if (!isApprovalFieldInEditFields) {
       return errAsync(
         new MalformedParametersError(
-          "For all steps, the selected approval field must also be included in same step's edit fields",
+          'Approval fields must be included in edit fields.',
         ),
       )
     }