diff --git a/client/src/instructor/IntroCourse/components/SeatPlanManager.tsx b/client/src/instructor/IntroCourse/components/SeatPlanManager.tsx
index a8d0d120..e395993c 100644
--- a/client/src/instructor/IntroCourse/components/SeatPlanManager.tsx
+++ b/client/src/instructor/IntroCourse/components/SeatPlanManager.tsx
@@ -26,7 +26,11 @@ import {
   Collapse,
 } from '@mantine/core'
 import {
+  IconBrandApple,
   IconDeviceLaptop,
+  IconDeviceMobile,
+  IconDeviceTablet,
+  IconDeviceWatch,
   IconDownload,
   IconEdit,
   IconMail,
@@ -749,6 +753,63 @@ export const SeatPlanManager = ({ keycloak }: SeatPlanManagerProps): JSX.Element
                 tutors.filter((tutor) => tutor.id === tutorId).at(0)?.lastName ?? ''
               }`,
           },
+          {
+            accessor: 'devices',
+            title: 'Devices',
+            textAlignment: 'center',
+            render: ({
+              appleId,
+              iphoneDeviceId,
+              ipadDeviceId,
+              appleWatchDeviceId,
+              macBookDeviceId,
+            }) => (
+              <>
+                <Stack>
+                  {!!appleId && (
+                    <Group>
+                      <IconBrandApple color='#2B70BE' />
+                      <Text c='dimmed' fw='500'>
+                        {appleId}
+                      </Text>
+                    </Group>
+                  )}
+                  {!!macBookDeviceId && (
+                    <Group>
+                      <IconDeviceLaptop color='#2B70BE' />
+                      <Text c='dimmed' fw='500'>
+                        {macBookDeviceId}
+                      </Text>
+                    </Group>
+                  )}
+                  {!!iphoneDeviceId && (
+                    <Group>
+                      <IconDeviceMobile color='#2B70BE' />
+                      <Text c='dimmed' fw='500'>
+                        {iphoneDeviceId}
+                      </Text>
+                    </Group>
+                  )}
+                  {!!ipadDeviceId && (
+                    <Group>
+                      <IconDeviceTablet color='#2B70BE' />
+                      <Text c='dimmed' fw='500'>
+                        {ipadDeviceId}
+                      </Text>
+                    </Group>
+                  )}
+                  {!!appleWatchDeviceId && (
+                    <Group>
+                      <IconDeviceWatch color='#2B70BE' />
+                      <Text c='dimmed' fw='500'>
+                        {appleWatchDeviceId}
+                      </Text>
+                    </Group>
+                  )}
+                </Stack>
+              </>
+            ),
+          },
           {
             accessor: 'seat',
             title: 'Seat',
diff --git a/client/src/instructor/MailingManagement/MailingManagementConsole.tsx b/client/src/instructor/MailingManagement/MailingManagementConsole.tsx
index b2567703..eb529f0c 100644
--- a/client/src/instructor/MailingManagement/MailingManagementConsole.tsx
+++ b/client/src/instructor/MailingManagement/MailingManagementConsole.tsx
@@ -193,7 +193,11 @@ export const MailingManagementConsole = (): JSX.Element => {
           {(MailTemplate[activeTemplate as keyof typeof MailTemplate] ===
             MailTemplate.THESIS_APPLICATION_ACCEPTANCE_NO_ADVISOR ||
             MailTemplate[activeTemplate as keyof typeof MailTemplate] ===
-              MailTemplate.THESIS_APPLICATION_REJECTION) && (
+              MailTemplate.THESIS_APPLICATION_REJECTION ||
+            MailTemplate[activeTemplate as keyof typeof MailTemplate] ===
+              MailTemplate.THESIS_APPLICATION_CONFIRMATION ||
+            MailTemplate[activeTemplate as keyof typeof MailTemplate] ===
+              MailTemplate.THESIS_APPLICATION_CREATED) && (
             <ThesisApplicationAndStudentInstructions />
           )}
           {MailTemplate[activeTemplate as keyof typeof MailTemplate] ===