diff --git a/client/src/forms/CoachApplicationForm.tsx b/client/src/forms/CoachApplicationForm.tsx
index 5977ba1a..5f5f88e7 100644
--- a/client/src/forms/CoachApplicationForm.tsx
+++ b/client/src/forms/CoachApplicationForm.tsx
@@ -9,6 +9,7 @@ import {
   Loader,
   Spoiler,
   Stack,
+  Text,
   Textarea,
   Title,
 } from '@mantine/core'
@@ -20,7 +21,6 @@ import { useEffect, useState } from 'react'
 import { fetchCourseIterationsWithOpenApplicationPeriod } from '../redux/courseIterationSlice/thunks/fetchAllCourseIterations'
 import { useDispatch } from 'react-redux'
 import { useAppSelector, type AppDispatch } from '../redux/store'
-import { type Patch } from '../service/configService'
 import { createCoachApplication } from '../service/applicationsService'
 import { ApplicationSuccessfulSubmission } from '../student/StudentApplicationSubmissionPage/ApplicationSuccessfulSubmission'
 import { DeclarationOfDataConsent } from './DeclarationOfDataConsent'
@@ -186,8 +186,8 @@ export const CoachApplicationForm = ({
                       />
                       <Spoiler
                         maxHeight={0}
-                        showLabel='View Data Consent Agreement'
-                        hideLabel='Hide'
+                        showLabel={<Text fz='sm'>Show Data Consent Agreement</Text>}
+                        hideLabel={<Text fz='sm'>Hide</Text>}
                       >
                         <DeclarationOfDataConsent />
                       </Spoiler>
@@ -227,35 +227,6 @@ export const CoachApplicationForm = ({
                             })
                             .catch(() => {})
                           onSuccess()
-                        } else if (
-                          defaultForm.isValid() &&
-                          coachForm.isValid() &&
-                          coachApplication
-                        ) {
-                          // TODO: differentiate between assessment and student application changes
-                          if (defaultForm.values.assessment) {
-                            const studentApplicationAssessmentPatchObjectArray: Patch[] = []
-                            Object.keys(defaultForm.values.assessment).forEach((key) => {
-                              if (defaultForm.isTouched('assessment.' + key)) {
-                                const studentApplicationPatchObject = new Map()
-                                studentApplicationPatchObject.set('op', 'replace')
-                                studentApplicationPatchObject.set('path', '/' + key)
-                                studentApplicationPatchObject.set(
-                                  'value',
-                                  defaultForm.getInputProps('assessment.' + key).value,
-                                )
-                                const obj = Object.fromEntries(studentApplicationPatchObject)
-                                studentApplicationAssessmentPatchObjectArray.push(obj)
-                              }
-                            })
-                            /* void dispatch(
-                  updateDeveloperApplicationAssessment({
-                    applicationId: developerApplication.id,
-                    applicationAssessmentPatch: studentApplicationAssessmentPatchObjectArray,
-                  }),
-                ) */
-                            onSuccess()
-                          }
                         }
                       }}
                     >
diff --git a/client/src/forms/DeveloperApplicationForm.tsx b/client/src/forms/DeveloperApplicationForm.tsx
index b2fddcea..ed8d346e 100644
--- a/client/src/forms/DeveloperApplicationForm.tsx
+++ b/client/src/forms/DeveloperApplicationForm.tsx
@@ -176,8 +176,8 @@ export const DeveloperApplicationForm = ({
                       />
                       <Spoiler
                         maxHeight={0}
-                        showLabel='View Data Consent Agreement'
-                        hideLabel='Hide'
+                        showLabel={<Text fz='sm'>Show Data Consent Agreement</Text>}
+                        hideLabel={<Text fz='sm'>Hide</Text>}
                       >
                         <DeclarationOfDataConsent />
                       </Spoiler>
diff --git a/client/src/forms/TutorApplicationForm.tsx b/client/src/forms/TutorApplicationForm.tsx
index 8ed58856..d4946cd5 100644
--- a/client/src/forms/TutorApplicationForm.tsx
+++ b/client/src/forms/TutorApplicationForm.tsx
@@ -22,7 +22,6 @@ import { useEffect, useState } from 'react'
 import { fetchCourseIterationsWithOpenApplicationPeriod } from '../redux/courseIterationSlice/thunks/fetchAllCourseIterations'
 import { useDispatch } from 'react-redux'
 import { useAppSelector, type AppDispatch } from '../redux/store'
-import { type Patch } from '../service/configService'
 import { createTutorApplication } from '../service/applicationsService'
 import { ApplicationSuccessfulSubmission } from '../student/StudentApplicationSubmissionPage/ApplicationSuccessfulSubmission'
 import { DeclarationOfDataConsent } from './DeclarationOfDataConsent'
@@ -188,8 +187,8 @@ export const TutorApplicationForm = ({
                       />
                       <Spoiler
                         maxHeight={0}
-                        showLabel='View Data Consent Agreement'
-                        hideLabel='Hide'
+                        showLabel={<Text fz='sm'>Show Data Consent Agreement</Text>}
+                        hideLabel={<Text fz='sm'>Hide</Text>}
                       >
                         <DeclarationOfDataConsent />
                       </Spoiler>
@@ -241,31 +240,6 @@ export const TutorApplicationForm = ({
                             })
                             .catch(() => {})
                           onSuccess()
-                        } else if (defaultForm.isValid() && tutorApplication) {
-                          const studentApplicationAssessmentPatchObjectArray: Patch[] = []
-                          if (defaultForm.values.assessment) {
-                            Object.keys(defaultForm.values.assessment).forEach((key) => {
-                              if (defaultForm.isTouched('assessment.' + key)) {
-                                const studentApplicationPatchObject = new Map()
-                                studentApplicationPatchObject.set('op', 'replace')
-                                studentApplicationPatchObject.set('path', '/' + key)
-                                studentApplicationPatchObject.set(
-                                  'value',
-                                  defaultForm.getInputProps('assessment.' + key).value,
-                                )
-                                const obj = Object.fromEntries(studentApplicationPatchObject)
-                                studentApplicationAssessmentPatchObjectArray.push(obj)
-                              }
-                            })
-
-                            /* void dispatch(
-                updateDeveloperApplicationAssessment({
-                  applicationId: developerApplication.id,
-                  applicationAssessmentPatch: studentApplicationAssessmentPatchObjectArray,
-                }),
-              ) */
-                            onSuccess()
-                          }
                         }
                       }}
                     >