diff --git a/client/src/components/ApplicationRejectButton/ApplicationRejectButton.tsx b/client/src/components/ApplicationRejectButton/ApplicationRejectButton.tsx
index 76c3db5b..5a56256e 100644
--- a/client/src/components/ApplicationRejectButton/ApplicationRejectButton.tsx
+++ b/client/src/components/ApplicationRejectButton/ApplicationRejectButton.tsx
@@ -13,6 +13,11 @@ interface IApplicationRejectButtonProps extends ButtonProps {
   onUpdate: (application: IApplication) => unknown
 }
 
+interface IFormValues {
+  notifyUser: boolean
+  reason: string | null
+}
+
 const ApplicationRejectButton = (props: IApplicationRejectButtonProps) => {
   const { application, onUpdate, ...buttonProps } = props
 
@@ -21,10 +26,7 @@ const ApplicationRejectButton = (props: IApplicationRejectButtonProps) => {
   const [confirmationModal, setConfirmationModal] = useState(false)
   const [loading, setLoading] = useState(false)
 
-  const form = useForm<{
-    notifyUser: boolean
-    reason: string | null
-  }>({
+  const form = useForm<IFormValues>({
     mode: 'controlled',
     initialValues: {
       notifyUser: true,
@@ -44,6 +46,46 @@ const ApplicationRejectButton = (props: IApplicationRejectButtonProps) => {
     return <></>
   }
 
+  const onReject = async (values: IFormValues) => {
+    setLoading(true)
+
+    try {
+      const response = await doRequest<IApplication[]>(
+        `/v2/applications/${application.applicationId}/reject`,
+        {
+          method: 'PUT',
+          requiresAuth: true,
+          data: {
+            reason: values.reason,
+            notifyUser: values.notifyUser,
+          },
+        },
+      )
+
+      if (response.ok) {
+        showSimpleSuccess('Application rejected successfully')
+
+        for (const item of response.data) {
+          updateApplicationContext(item)
+        }
+
+        const currentApplication = response.data.find(
+          (item) => item.applicationId === application.applicationId,
+        )
+
+        if (currentApplication) {
+          onUpdate(currentApplication)
+        }
+
+        setConfirmationModal(false)
+      } else {
+        showSimpleError(getApiResponseErrorMessage(response))
+      }
+    } finally {
+      setLoading(false)
+    }
+  }
+
   const reasons: Array<{ value: string; label: string }> = [
     application.topic
       ? {
@@ -78,47 +120,7 @@ const ApplicationRejectButton = (props: IApplicationRejectButtonProps) => {
         onClick={(e) => e.stopPropagation()}
         onClose={() => setConfirmationModal(false)}
       >
-        <form
-          onSubmit={form.onSubmit(async (values) => {
-            setLoading(true)
-
-            try {
-              const response = await doRequest<IApplication[]>(
-                `/v2/applications/${application.applicationId}/reject`,
-                {
-                  method: 'PUT',
-                  requiresAuth: true,
-                  data: {
-                    reason: values.reason,
-                    notifyUser: values.notifyUser,
-                  },
-                },
-              )
-
-              if (response.ok) {
-                showSimpleSuccess('Application rejected successfully')
-
-                for (const item of response.data) {
-                  updateApplicationContext(item)
-                }
-
-                const currentApplication = response.data.find(
-                  (item) => item.applicationId === application.applicationId,
-                )
-
-                if (currentApplication) {
-                  onUpdate(currentApplication)
-                }
-
-                setConfirmationModal(false)
-              } else {
-                showSimpleError(getApiResponseErrorMessage(response))
-              }
-            } finally {
-              setLoading(false)
-            }
-          })}
-        >
+        <form>
           <Stack>
             <Text>Please specify a reason why you want to reject the student</Text>
             <Radio.Group label='Reason' required {...form.getInputProps('reason')}>
@@ -133,7 +135,12 @@ const ApplicationRejectButton = (props: IApplicationRejectButtonProps) => {
               required
               {...form.getInputProps('notifyUser', { type: 'checkbox' })}
             />
-            <Button type='submit' loading={loading} disabled={!form.isValid()} fullWidth>
+            <Button
+              onClick={() => onReject(form.getValues())}
+              loading={loading}
+              disabled={!form.isValid()}
+              fullWidth
+            >
               Reject Application
             </Button>
           </Stack>
diff --git a/client/src/components/ApplicationReviewForm/ApplicationReviewForm.tsx b/client/src/components/ApplicationReviewForm/ApplicationReviewForm.tsx
index ce900c6d..b4c03848 100644
--- a/client/src/components/ApplicationReviewForm/ApplicationReviewForm.tsx
+++ b/client/src/components/ApplicationReviewForm/ApplicationReviewForm.tsx
@@ -123,7 +123,7 @@ const ApplicationReviewForm = (props: IApplicationReviewFormProps) => {
     }
   }, [debouncedComment, application?.applicationId])
 
-  const onSubmit = async (values: IApplicationReviewForm) => {
+  const onAccept = async (values: IApplicationReviewForm) => {
     setLoading(true)
 
     try {
@@ -204,7 +204,7 @@ const ApplicationReviewForm = (props: IApplicationReviewFormProps) => {
   }
 
   return (
-    <form onSubmit={form.onSubmit((values) => onSubmit(values))}>
+    <form>
       <Stack gap='sm'>
         {reviewers.map((reviewer) => (
           <Group key={reviewer.user.userId} grow wrap='nowrap'>
@@ -296,7 +296,7 @@ const ApplicationReviewForm = (props: IApplicationReviewFormProps) => {
               }}
             />
             <Button
-              type='submit'
+              onClick={() => onAccept(form.getValues())}
               variant='outline'
               color='green'
               loading={loading}
diff --git a/server/mail-templates/thesis-final-submission.html b/server/mail-templates/thesis-final-submission.html
index 5fd8322c..222e06d3 100644
--- a/server/mail-templates/thesis-final-submission.html
+++ b/server/mail-templates/thesis-final-submission.html
@@ -5,7 +5,6 @@
 </p>
 
 <p>
-  You can find the submitted files in the attachment part of this email.
   The next step is to write an assessment about the thesis.
 </p>
 
diff --git a/server/src/main/java/thesistrack/ls1/service/MailingService.java b/server/src/main/java/thesistrack/ls1/service/MailingService.java
index fc8efca3..600f3690 100644
--- a/server/src/main/java/thesistrack/ls1/service/MailingService.java
+++ b/server/src/main/java/thesistrack/ls1/service/MailingService.java
@@ -263,8 +263,8 @@ public void sendFinalSubmissionEmail(Thesis thesis) {
                 .sendToThesisAdvisors(thesis)
                 .addNotificationName("thesis-" + thesis.getId())
                 .fillThesisPlaceholders(thesis)
-                .addStoredAttachment(thesis.getFinalThesisFilename(), getThesisFilename(thesis, "File", thesis.getFinalThesisFilename()))
-                .addStoredAttachment(thesis.getFinalPresentationFilename(), getThesisFilename(thesis, "Presentation", thesis.getFinalPresentationFilename()))
+                //.addStoredAttachment(thesis.getFinalThesisFilename(), getThesisFilename(thesis, "File", thesis.getFinalThesisFilename()))
+                //.addStoredAttachment(thesis.getFinalPresentationFilename(), getThesisFilename(thesis, "Presentation", thesis.getFinalPresentationFilename()))
                 .send(javaMailSender, uploadService);
     }
 
diff --git a/server/src/main/java/thesistrack/ls1/utility/MailBuilder.java b/server/src/main/java/thesistrack/ls1/utility/MailBuilder.java
index 782607b3..caf3d15d 100644
--- a/server/src/main/java/thesistrack/ls1/utility/MailBuilder.java
+++ b/server/src/main/java/thesistrack/ls1/utility/MailBuilder.java
@@ -11,6 +11,7 @@
 import lombok.Getter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.mail.MailSendException;
 import org.springframework.mail.javamail.JavaMailSender;
 import thesistrack.ls1.constants.ThesisRoleName;
 import thesistrack.ls1.dto.ApplicationDto;
@@ -368,7 +369,7 @@ public void send(JavaMailSender mailSender, UploadService uploadService) throws
                 } else {
                     log.info("Sending Mail (postfix disabled)\n{}", MailLogger.getTextFromMimeMessage(message));
                 }
-            } catch (MessagingException exception) {
+            } catch (Exception exception) {
                 log.warn("Failed to send email", exception);
             }
         }