diff --git a/apps/api/email/registration-successful.mjml b/apps/api/email/registration-successful.mjml
index 1e49badc..f61ffa83 100644
--- a/apps/api/email/registration-successful.mjml
+++ b/apps/api/email/registration-successful.mjml
@@ -18,6 +18,13 @@
     >Hier Foto hochladen</a
   >
 </mj-text>
+
+<mj-text
+  font-size="16px"
+  line-height="1.5"
+>
+  Du kannst den Fotoupload beliebig oft machen, bis der Meldeschluss erreicht ist.
+</mj-text>
 {{/if}}
 
 <mj-text
diff --git a/apps/api/src/services/anmeldung/anmeldungAccessTokenValidate.ts b/apps/api/src/services/anmeldung/anmeldungAccessTokenValidate.ts
index a906cd4b..78b032da 100644
--- a/apps/api/src/services/anmeldung/anmeldungAccessTokenValidate.ts
+++ b/apps/api/src/services/anmeldung/anmeldungAccessTokenValidate.ts
@@ -10,8 +10,8 @@ export const anmeldungAccessTokenValidateProcedure = definePublicQueryProcedure(
     anmeldungId: z.number().int(),
     accessToken: z.string().uuid(),
   }),
-  handler: ({ input: { unterveranstaltungId, anmeldungId, accessToken } }) =>
-    prisma.anmeldung.findFirst({
+  handler: ({ input: { unterveranstaltungId, anmeldungId, accessToken } }) => {
+    return prisma.anmeldung.findFirst({
       where: {
         unterveranstaltungId,
         id: anmeldungId,
@@ -23,6 +23,7 @@ export const anmeldungAccessTokenValidateProcedure = definePublicQueryProcedure(
             id: true,
             firstname: true,
             lastname: true,
+            photoId: true,
           },
         },
         unterveranstaltung: {
@@ -40,5 +41,6 @@ export const anmeldungAccessTokenValidateProcedure = definePublicQueryProcedure(
           },
         },
       },
-    }),
+    })
+  },
 })
diff --git a/apps/api/src/services/anmeldung/anmeldungFotoUpload.ts b/apps/api/src/services/anmeldung/anmeldungFotoUpload.ts
index 240d3a61..c68fc2f1 100644
--- a/apps/api/src/services/anmeldung/anmeldungFotoUpload.ts
+++ b/apps/api/src/services/anmeldung/anmeldungFotoUpload.ts
@@ -3,6 +3,8 @@ import z from 'zod'
 import prisma from '../../prisma.js'
 
 import { definePublicMutateProcedure } from '../../types/defineProcedure.js'
+import { TRPCError } from '@trpc/server'
+import type { Prisma } from '@prisma/client'
 
 export const anmeldungFotoUploadProcedure = definePublicMutateProcedure({
   key: 'anmeldungFotoUpload',
@@ -13,14 +15,43 @@ export const anmeldungFotoUploadProcedure = definePublicMutateProcedure({
     fileId: z.string(),
   }),
   handler: async ({ input: { unterveranstaltungId, anmeldungId, accessToken, fileId } }) => {
-    await prisma.anmeldung.update({
+    const unterveranstaltung = await prisma.unterveranstaltung.findFirst({
       where: {
-        unterveranstaltungId,
-        id: anmeldungId,
-        accessToken,
+        id: unterveranstaltungId,
+        meldeschluss: {
+          gt: new Date(),
+        },
       },
+    })
+    if (unterveranstaltung === null) {
+      throw new TRPCError({
+        code: 'FORBIDDEN',
+        message: 'Der Meldeschluss ist bereits erreicht!',
+      })
+    }
+
+    const where: Prisma.AnmeldungWhereUniqueInput = {
+      unterveranstaltungId,
+      id: anmeldungId,
+      accessToken,
+    }
+    const anmeldung = await prisma.anmeldung.findUniqueOrThrow({
+      where,
+      select: {
+        person: {
+          select: {
+            photoId: true,
+          },
+        },
+      },
+    })
+    if (anmeldung.person.photoId !== null) {
+      // TODO: Delete old file
+    }
+
+    await prisma.anmeldung.update({
+      where,
       data: {
-        accessToken: null,
         person: {
           update: {
             photoId: fileId,
diff --git a/apps/api/src/services/customFields/customFields.router.ts b/apps/api/src/services/customFields/customFields.router.ts
index f7d75c3d..b3d6b8d6 100644
--- a/apps/api/src/services/customFields/customFields.router.ts
+++ b/apps/api/src/services/customFields/customFields.router.ts
@@ -6,8 +6,8 @@ import { customFieldsList } from './customFieldsList.js'
 import { customFieldsTemplates } from './customFieldsTemplates.js'
 import { customFieldsUnterveranstaltungCreate } from './customFieldsUnterveranstaltungCreate.js'
 import { customFieldsVeranstaltungCreate } from './customFieldsVeranstaltungCreate.js'
-import { customFieldsVeranstaltungDelete } from './customFieldsVeranstaltungDelete.js'
-import { customFieldsVeranstaltungUpdate } from './customFieldsVeranstaltungUpdate.js'
+import { customFieldsDelete } from './customFieldsDelete.js'
+import { customFieldsUpdate } from './customFieldsUpdate.js'
 import { customFieldValuesUpdate } from './customFieldValuesUpdate.js'
 // Import Routes here - do not delete this line
 
@@ -15,8 +15,8 @@ export const customFieldsRouter = mergeRouters(
   customFieldsList.router,
   customFieldsGet.router,
   customFieldsVeranstaltungCreate.router,
-  customFieldsVeranstaltungUpdate.router,
-  customFieldsVeranstaltungDelete.router,
+  customFieldsUpdate.router,
+  customFieldsDelete.router,
   customFieldsUnterveranstaltungCreate.router,
   customFieldValuesUpdate.router,
   customFieldsTemplates.router
diff --git a/apps/api/src/services/customFields/customFieldsDelete.ts b/apps/api/src/services/customFields/customFieldsDelete.ts
new file mode 100644
index 00000000..8f7adccc
--- /dev/null
+++ b/apps/api/src/services/customFields/customFieldsDelete.ts
@@ -0,0 +1,66 @@
+import { Role } from '@prisma/client'
+import { TRPCError } from '@trpc/server'
+import { z } from 'zod'
+
+import prisma from '../../prisma.js'
+import { defineProtectedMutateProcedure } from '../../types/defineProcedure.js'
+
+export const customFieldsDelete = defineProtectedMutateProcedure({
+  key: 'delete',
+  roleIds: [Role.ADMIN, Role.GLIEDERUNG_ADMIN],
+  inputSchema: z.strictObject({
+    veranstaltungId: z.number(),
+    fieldId: z.number(),
+  }),
+  async handler({ ctx, input }) {
+    if (ctx.account.role === Role.GLIEDERUNG_ADMIN) {
+      const { gliederungId: gliederungIdActor } = await prisma.person.findFirstOrThrow({
+        where: {
+          account: {
+            id: ctx.accountId,
+          },
+        },
+        select: {
+          gliederungId: true,
+        },
+      })
+      const customField = await prisma.customField.findUniqueOrThrow({
+        where: {
+          id: input.fieldId,
+        },
+        select: {
+          unterveranstaltung: {
+            select: {
+              gliederungId: true,
+            },
+          },
+        },
+      })
+      if (gliederungIdActor !== customField.unterveranstaltung?.gliederungId) {
+        throw new TRPCError({
+          code: 'NOT_FOUND',
+        })
+      }
+    }
+
+    const field = await prisma.customField.findUnique({
+      where: {
+        id: input.fieldId,
+        veranstaltungId: input.veranstaltungId,
+      },
+    })
+
+    if (field === null) {
+      throw new TRPCError({
+        code: 'NOT_FOUND',
+      })
+    }
+
+    await prisma.customField.delete({
+      where: {
+        id: input.fieldId,
+        veranstaltungId: input.veranstaltungId,
+      },
+    })
+  },
+})
diff --git a/apps/api/src/services/customFields/customFieldsUpdate.ts b/apps/api/src/services/customFields/customFieldsUpdate.ts
new file mode 100644
index 00000000..4ef8c3ea
--- /dev/null
+++ b/apps/api/src/services/customFields/customFieldsUpdate.ts
@@ -0,0 +1,57 @@
+import { Role } from '@prisma/client'
+import { z } from 'zod'
+
+import prisma from '../../prisma.js'
+import { defineProtectedMutateProcedure } from '../../types/defineProcedure.js'
+
+import { TRPCError } from '@trpc/server'
+import { customFieldSchema } from './schema/customField.schema.js'
+
+export const customFieldsUpdate = defineProtectedMutateProcedure({
+  key: 'update',
+  roleIds: [Role.ADMIN, Role.GLIEDERUNG_ADMIN],
+  inputSchema: z.strictObject({
+    fieldId: z.number(),
+    data: customFieldSchema,
+  }),
+  async handler({ ctx, input }) {
+    if (ctx.account.role === Role.GLIEDERUNG_ADMIN) {
+      const { gliederungId: gliederungIdActor } = await prisma.person.findFirstOrThrow({
+        where: {
+          account: {
+            id: ctx.accountId,
+          },
+        },
+        select: {
+          gliederungId: true,
+        },
+      })
+      const customField = await prisma.customField.findUniqueOrThrow({
+        where: {
+          id: input.fieldId,
+        },
+        select: {
+          unterveranstaltung: {
+            select: {
+              gliederungId: true,
+            },
+          },
+        },
+      })
+      if (gliederungIdActor !== customField.unterveranstaltung?.gliederungId) {
+        throw new TRPCError({
+          code: 'NOT_FOUND',
+        })
+      }
+    }
+
+    return await prisma.customField.update({
+      where: {
+        id: input.fieldId,
+      },
+      data: {
+        ...input.data,
+      },
+    })
+  },
+})
diff --git a/apps/api/src/services/customFields/customFieldsVeranstaltungDelete.ts b/apps/api/src/services/customFields/customFieldsVeranstaltungDelete.ts
deleted file mode 100644
index f6876733..00000000
--- a/apps/api/src/services/customFields/customFieldsVeranstaltungDelete.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { Role } from '@prisma/client'
-import { TRPCError } from '@trpc/server'
-import { z } from 'zod'
-
-import prisma from '../../prisma.js'
-import { defineProtectedMutateProcedure } from '../../types/defineProcedure.js'
-
-export const customFieldsVeranstaltungDelete = defineProtectedMutateProcedure({
-  key: 'veranstaltungDelete',
-  roleIds: [Role.ADMIN],
-  inputSchema: z.strictObject({
-    veranstaltungId: z.number(),
-    fieldId: z.number(),
-  }),
-  async handler({ input }) {
-    const field = await prisma.customField.findUnique({
-      where: {
-        id: input.fieldId,
-        veranstaltungId: input.veranstaltungId,
-      },
-    })
-
-    if (field === null) {
-      throw new TRPCError({
-        code: 'NOT_FOUND',
-      })
-    }
-
-    await prisma.customField.delete({
-      where: {
-        id: input.fieldId,
-        veranstaltungId: input.veranstaltungId,
-      },
-    })
-  },
-})
diff --git a/apps/api/src/services/customFields/customFieldsVeranstaltungUpdate.ts b/apps/api/src/services/customFields/customFieldsVeranstaltungUpdate.ts
deleted file mode 100644
index d8e0fd73..00000000
--- a/apps/api/src/services/customFields/customFieldsVeranstaltungUpdate.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { Role } from '@prisma/client'
-import { z } from 'zod'
-
-import prisma from '../../prisma.js'
-import { defineProtectedMutateProcedure } from '../../types/defineProcedure.js'
-
-import { customFieldSchema } from './schema/customField.schema.js'
-
-export const customFieldsVeranstaltungUpdate = defineProtectedMutateProcedure({
-  key: 'veranstaltungUpdate',
-  roleIds: [Role.ADMIN],
-  inputSchema: z.strictObject({
-    fieldId: z.number(),
-    data: customFieldSchema,
-  }),
-  async handler({ input }) {
-    return await prisma.customField.update({
-      where: {
-        id: input.fieldId,
-      },
-      data: {
-        ...input.data,
-      },
-    })
-  },
-})
diff --git a/apps/api/src/services/person/person.router.ts b/apps/api/src/services/person/person.router.ts
index 31f0aace..6ae0554a 100644
--- a/apps/api/src/services/person/person.router.ts
+++ b/apps/api/src/services/person/person.router.ts
@@ -2,10 +2,9 @@
 import { mergeRouters } from '../../trpc.js'
 import { personAuthenticatedGetProcedure } from './personAuthenticatedGet.js'
 import { personGetProcedure } from './personGet.js'
-import { personGliederungPatchProcedure } from './personGliederungPatch.js'
 import { personCountProcedure, personListProcedure } from './personList.js'
 import { personVerwaltungCreateProcedure } from './personVerwaltungCreate.js'
-import { personVerwaltungPatchProcedure } from './personVerwaltungPatch.js'
+import { personVerwaltungPatchProcedure } from './personPatch.js'
 import { personVerwaltungRemoveProcedure } from './personVerwaltungRemove.js'
 // Import Routes here - do not delete this line
 
@@ -16,7 +15,6 @@ export const personRouter = mergeRouters(
   personCountProcedure.router,
   personGetProcedure.router,
   personVerwaltungPatchProcedure.router,
-  personVerwaltungRemoveProcedure.router,
-  personGliederungPatchProcedure.router
+  personVerwaltungRemoveProcedure.router
   // Add Routes here - do not delete this line
 )
diff --git a/apps/api/src/services/person/personGet.ts b/apps/api/src/services/person/personGet.ts
index 11a645d0..a4f77bb0 100644
--- a/apps/api/src/services/person/personGet.ts
+++ b/apps/api/src/services/person/personGet.ts
@@ -17,8 +17,6 @@ export const personGetProcedure = defineProtectedQueryProcedure({
       id: input.id,
     }
 
-    console.log(where)
-
     return prisma.person.findUniqueOrThrow({
       where,
       select: {
diff --git a/apps/api/src/services/person/personGliederungPatch.ts b/apps/api/src/services/person/personGliederungPatch.ts
deleted file mode 100644
index 11f669de..00000000
--- a/apps/api/src/services/person/personGliederungPatch.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { Role } from '@prisma/client'
-import z from 'zod'
-
-import prisma from '../../prisma.js'
-import { defineProtectedMutateProcedure } from '../../types/defineProcedure.js'
-
-import { getPersonCreateData, personSchema } from './schema/person.schema.js'
-
-export const personGliederungPatchProcedure = defineProtectedMutateProcedure({
-  key: 'gliederungPatch',
-  roleIds: [Role.GLIEDERUNG_ADMIN],
-  inputSchema: z.strictObject({
-    id: z.number().int(),
-    data: personSchema,
-  }),
-  async handler({ input }) {
-    await prisma.notfallkontakt.deleteMany({
-      where: {
-        personId: input.id,
-      },
-    })
-
-    return prisma.person.update({
-      where: {
-        id: input.id,
-      },
-      data: await getPersonCreateData(input.data),
-      select: {
-        id: true,
-      },
-    })
-  },
-})
diff --git a/apps/api/src/services/person/personPatch.ts b/apps/api/src/services/person/personPatch.ts
new file mode 100644
index 00000000..6e690ce6
--- /dev/null
+++ b/apps/api/src/services/person/personPatch.ts
@@ -0,0 +1,61 @@
+import { Role } from '@prisma/client'
+import z from 'zod'
+
+import prisma from '../../prisma.js'
+import { defineProtectedMutateProcedure } from '../../types/defineProcedure.js'
+
+import { getPersonCreateData, personSchemaOptional } from './schema/person.schema.js'
+import { TRPCError } from '@trpc/server'
+
+export const personVerwaltungPatchProcedure = defineProtectedMutateProcedure({
+  key: 'patch',
+  roleIds: [Role.ADMIN, Role.GLIEDERUNG_ADMIN],
+  inputSchema: z.strictObject({
+    id: z.number().int(),
+    data: personSchemaOptional,
+  }),
+  async handler({ ctx, input }) {
+    if (ctx.account.role === 'GLIEDERUNG_ADMIN') {
+      const { gliederungId: gliederungIdActor } = await prisma.person.findFirstOrThrow({
+        where: {
+          account: {
+            id: ctx.accountId,
+          },
+        },
+        select: {
+          gliederungId: true,
+        },
+      })
+      const { gliederungId: gliederungIdTarget } = await prisma.person.findUniqueOrThrow({
+        where: {
+          id: input.id,
+        },
+        select: {
+          gliederungId: true,
+        },
+      })
+
+      if (gliederungIdTarget !== gliederungIdActor) {
+        throw new TRPCError({
+          code: 'NOT_FOUND',
+        })
+      }
+    }
+
+    await prisma.notfallkontakt.deleteMany({
+      where: {
+        personId: input.id,
+      },
+    })
+
+    return prisma.person.update({
+      where: {
+        id: input.id,
+      },
+      data: await getPersonCreateData(input.data),
+      select: {
+        id: true,
+      },
+    })
+  },
+})
diff --git a/apps/api/src/services/person/personVerwaltungPatch.ts b/apps/api/src/services/person/personVerwaltungPatch.ts
deleted file mode 100644
index ecf3fa2a..00000000
--- a/apps/api/src/services/person/personVerwaltungPatch.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { Role } from '@prisma/client'
-import z from 'zod'
-
-import prisma from '../../prisma.js'
-import { defineProtectedMutateProcedure } from '../../types/defineProcedure.js'
-
-import { getPersonCreateData, personSchemaOptional } from './schema/person.schema.js'
-
-export const personVerwaltungPatchProcedure = defineProtectedMutateProcedure({
-  key: 'verwaltungPatch',
-  roleIds: [Role.ADMIN],
-  inputSchema: z.strictObject({
-    id: z.number().int(),
-    data: personSchemaOptional,
-  }),
-  async handler({ input }) {
-    await prisma.notfallkontakt.deleteMany({
-      where: {
-        personId: input.id,
-      },
-    })
-
-    return prisma.person.update({
-      where: {
-        id: input.id,
-      },
-      data: await getPersonCreateData(input.data),
-      select: {
-        id: true,
-      },
-    })
-  },
-})
diff --git a/apps/frontend/package.json b/apps/frontend/package.json
index 4ec38e0b..9fda9fa3 100644
--- a/apps/frontend/package.json
+++ b/apps/frontend/package.json
@@ -37,6 +37,7 @@
     "@vueuse/router": "^12.3.0",
     "clsx": "^2.1.1",
     "http2-proxy": "^5.0.53",
+    "human-filetypes": "^1.1.3",
     "intl-tel-input": "^24.4.0",
     "primevue": "^4.2.5",
     "radix-vue": "^1.9.5",
diff --git a/apps/frontend/src/components/BasicInputs/InputFileUploadArea.vue b/apps/frontend/src/components/BasicInputs/InputFileUploadArea.vue
index 2d2f78e0..d32a7f0e 100644
--- a/apps/frontend/src/components/BasicInputs/InputFileUploadArea.vue
+++ b/apps/frontend/src/components/BasicInputs/InputFileUploadArea.vue
@@ -2,6 +2,9 @@
 import { computed, onMounted, ref, shallowRef } from 'vue'
 
 import { formatBytes } from '@codeanker/helpers'
+import { TrashIcon } from '@heroicons/vue/24/solid'
+import { fromMime, type FileKind } from 'human-filetypes'
+import Button from '../UIComponents/Button.vue'
 
 const props = defineProps<{
   multiple?: Multiple
@@ -10,10 +13,7 @@ const props = defineProps<{
   maxFileSize?: number
   fullWindowDropzone?: boolean
   uploadText?: string
-}>()
-
-const emit = defineEmits<{
-  uploaded: [Multiple extends true ? File[] : File]
+  onUpload: (files: Multiple extends true ? File[] : File) => Promise<void>
 }>()
 
 const InputFileUploadAreaConf = {
@@ -61,22 +61,30 @@ function dropZoneDrop(event) {
   event.preventDefault()
   event.stopPropagation()
   dragCounter.value = 0
-  return upload(event.dataTransfer.files)
+
+  files.value.push(...Array.from<File>(event.dataTransfer.files))
 }
 
+const files = ref<File[]>([])
+
 function uploadFileInput(event) {
-  return upload(event.target.files)
+  files.value.push(...Array.from<File>(event.target.files))
 }
 
-async function upload(files) {
-  if (uploadPending.value || !files || !files[0]) {
+function fileUrl(file: File) {
+  return URL.createObjectURL(file)
+}
+
+async function upload() {
+  if (uploadPending.value || !files.value || !files.value[0]) {
     return
   }
   try {
     uploadPending.value = true
     error.value = null
-    const result = await handleUpload(files, props.multiple, props.maxFileSize)
-    emit('uploaded', result)
+    const result = await prepareUpload(files.value, props.multiple, props.maxFileSize)
+    await props.onUpload(result)
+    files.value = []
   } catch (uploadError: any) {
     if (uploadError.message === 'file size too large' && props.maxFileSize) {
       error.value = `Die Dateigröße muss kleiner als ${formatBytes(props.maxFileSize)} sein`
@@ -92,7 +100,7 @@ async function upload(files) {
   }
 }
 
-async function handleUpload(uploadFiles, multiple = false, maxFileSize) {
+async function prepareUpload(uploadFiles, multiple = false, maxFileSize) {
   if (multiple) {
     const toUploadFiles: any[] = []
     for (const key in uploadFiles) {
@@ -119,6 +127,22 @@ async function handleUpload(uploadFiles, multiple = false, maxFileSize) {
     }
   }
 }
+
+const mimeMap: Record<FileKind, string> = {
+  image: 'Bild',
+  video: 'Video',
+  audio: 'Audio',
+  archive: 'Archiv',
+  document: 'Dokument',
+  spreadsheet: 'Tabelle',
+  presentation: 'Präsentation',
+  font: 'Schriftart',
+  text: 'Text',
+  application: 'Ausführbare Datei',
+  unknown: 'Unbekanntes Dateiformat',
+}
+
+defineExpose({ files })
 </script>
 
 <template>
@@ -131,25 +155,67 @@ async function handleUpload(uploadFiles, multiple = false, maxFileSize) {
       }"
       @click="fileInput?.click()"
     >
-      <div>
-        <slot>
-          <div class="flex items-center space-x-4">
-            <i class="fad fa-upload fa-2x flex-shrink-0" />
-            <h5 class="mb-0">{{ uploadText ?? 'Datei hier hin ziehen oder klicken.' }}</h5>
-          </div>
-        </slot>
-      </div>
+      <slot>
+        <div class="flex items-center space-x-4">
+          <i class="fad fa-upload fa-2x flex-shrink-0" />
+          <h5 class="mb-0">{{ uploadText ?? 'Datei hier hin ziehen oder klicken.' }}</h5>
+        </div>
+      </slot>
+
       <input
-        id="hidden-input"
         ref="fileInput"
         type="file"
         :multiple="multiple"
         :accept="accept"
         :disabled="uploadPending || disabled"
-        class="hidden"
+        class="!hidden"
         @change="uploadFileInput"
         @click.stop
       />
     </div>
+
+    <Button
+      class="w-full mt-4"
+      :disabled="files.length === 0 || props.disabled"
+      @click="upload"
+    >
+      Hochladen
+    </Button>
+
+    <template v-if="files.length > 0">
+      <div class="mt-4 flex flex-row gap-x-4 justify-center">
+        <template
+          v-for="(file, index) in files"
+          :key="index"
+        >
+          <div class="relative">
+            <img
+              v-if="file.type.startsWith('image')"
+              :src="fileUrl(file)"
+              class="h-[384px] drop-shadow-lg"
+            />
+            <div
+              v-else
+              class="size-[192px] bg-primary-100 flex flex-col gap-y-2 items-center justify-center rounded border-2 border-primary-200"
+            >
+              <p>
+                <strong>{{ file.name }}</strong>
+              </p>
+              <p>
+                <i>{{ mimeMap[fromMime(file.type)] }}</i>
+              </p>
+            </div>
+
+            <button
+              type="button"
+              class="absolute top-2 right-2 bg-white/80 text-red-500 p-2 rounded-full"
+              @click="files.splice(index, 1)"
+            >
+              <TrashIcon class="size-6" />
+            </button>
+          </div>
+        </template>
+      </div>
+    </template>
   </div>
 </template>
diff --git a/apps/frontend/src/components/CustomFields/CustomFieldsFormEdit.vue b/apps/frontend/src/components/CustomFields/CustomFieldsFormEdit.vue
index 1f356a0d..f57a3658 100644
--- a/apps/frontend/src/components/CustomFields/CustomFieldsFormEdit.vue
+++ b/apps/frontend/src/components/CustomFields/CustomFieldsFormEdit.vue
@@ -50,7 +50,7 @@ const {
     const data = form.value
 
     try {
-      await apiClient.customFields.veranstaltungUpdate.mutate({
+      await apiClient.customFields.update.mutate({
         fieldId: props.fieldId,
         data: {
           name: data.name,
@@ -79,7 +79,7 @@ const {
   isLoading: isDeleting,
 } = useAsyncState(
   async () => {
-    await apiClient.customFields.veranstaltungDelete.mutate({
+    await apiClient.customFields.delete.mutate({
       fieldId: field.value!.id,
       veranstaltungId: 0,
     })
diff --git a/apps/frontend/src/components/CustomFields/CustomFieldsTable.vue b/apps/frontend/src/components/CustomFields/CustomFieldsTable.vue
index 85c761af..674aa71e 100644
--- a/apps/frontend/src/components/CustomFields/CustomFieldsTable.vue
+++ b/apps/frontend/src/components/CustomFields/CustomFieldsTable.vue
@@ -34,7 +34,15 @@ const router = useRouter()
 type Field = (typeof fields.value)[number]
 
 function canEdit(field: Field) {
-  return loggedInAccount.value?.role === 'ADMIN' || field.unterveranstaltungId !== null
+  if (field.veranstaltungId !== null && loggedInAccount.value?.role === 'ADMIN') {
+    return true
+  }
+
+  if (field.unterveranstaltungId !== null && loggedInAccount.value?.role !== 'USER') {
+    return true
+  }
+
+  return false
 }
 
 function onClickRow(field: Field) {
diff --git a/apps/frontend/src/components/LayoutComponents/PublicFooter.vue b/apps/frontend/src/components/LayoutComponents/PublicFooter.vue
index 838e8505..430ea03b 100644
--- a/apps/frontend/src/components/LayoutComponents/PublicFooter.vue
+++ b/apps/frontend/src/components/LayoutComponents/PublicFooter.vue
@@ -5,7 +5,6 @@ const commitHash = import.meta.env.VITE_APP_COMMIT_HASH || '000000'
 import { injectUnterveranstaltung } from '@/layouts/AnmeldungLayout.vue'
 import { formatDate } from '@vueuse/core'
 const unterveranstaltung = injectUnterveranstaltung()
-console.log(unterveranstaltung)
 </script>
 
 <template>
diff --git a/apps/frontend/src/components/UIComponents/AvatarEditModal.vue b/apps/frontend/src/components/UIComponents/AvatarEditModal.vue
index da23843f..cf5909b7 100644
--- a/apps/frontend/src/components/UIComponents/AvatarEditModal.vue
+++ b/apps/frontend/src/components/UIComponents/AvatarEditModal.vue
@@ -40,7 +40,7 @@ async function upload(toUploadFile: File) {
   uploadPending.value = true
   try {
     const res = await handleUpload(toUploadFile)
-    await apiClient.person.verwaltungPatch.mutate({
+    await apiClient.person.patch.mutate({
       id: props.personId,
       data: {
         photoId: res.id,
@@ -57,7 +57,7 @@ async function upload(toUploadFile: File) {
 async function remove() {
   uploadPending.value = true
   try {
-    await apiClient.person.verwaltungPatch.mutate({
+    await apiClient.person.patch.mutate({
       id: props.personId,
       data: {
         photoId: null,
@@ -101,7 +101,7 @@ defineExpose({ open, close })
             :multiple="false"
             upload-text="Bild hier hin ziehen oder klicken."
             class="w-full"
-            @uploaded="upload"
+            :on-upload="upload"
           />
         </div>
         <div class="mt-6 grid gap-4">
diff --git a/apps/frontend/src/components/data/AnmeldungenTable.vue b/apps/frontend/src/components/data/AnmeldungenTable.vue
index c916b2a2..93679c1f 100644
--- a/apps/frontend/src/components/data/AnmeldungenTable.vue
+++ b/apps/frontend/src/components/data/AnmeldungenTable.vue
@@ -141,8 +141,8 @@ const { execute: updateAnmeldung } = useAsyncState(
           weitereIntoleranzen: anmeldung.essgewohnheiten.weitereIntoleranzen,
         },
       }
+      await apiClient.person.patch.mutate(data)
       if (loggedInAccount.value?.role === 'ADMIN') {
-        await apiClient.person.verwaltungPatch.mutate(data)
         await apiClient.anmeldung.verwaltungPatch.mutate({
           id: selectedAnmeldungId.value,
           data: {
@@ -150,7 +150,6 @@ const { execute: updateAnmeldung } = useAsyncState(
           },
         })
       } else {
-        await apiClient.person.gliederungPatch.mutate(data)
         await apiClient.anmeldung.gliederungPatch.mutate({
           id: selectedAnmeldungId.value,
           data: {
diff --git a/apps/frontend/src/components/forms/person/PersonPhotoUpload.vue b/apps/frontend/src/components/forms/person/PersonPhotoUpload.vue
index a7312edf..59f5e448 100644
--- a/apps/frontend/src/components/forms/person/PersonPhotoUpload.vue
+++ b/apps/frontend/src/components/forms/person/PersonPhotoUpload.vue
@@ -35,7 +35,7 @@ async function onFileChanged(event: Event) {
   if (!file) return
 
   const res = await handleUpload(file)
-  await apiClient.person.verwaltungPatch.mutate({
+  await apiClient.person.patch.mutate({
     id: props.person.id,
     data: {
       photoId: res.id,
@@ -46,7 +46,7 @@ async function onFileChanged(event: Event) {
 }
 
 async function handleFileDelete() {
-  await apiClient.person.verwaltungPatch.mutate({
+  await apiClient.person.patch.mutate({
     id: props.person.id,
     data: {
       photoId: null,
diff --git a/apps/frontend/src/components/forms/unterveranstaltung/FormUnterveranstaltungLandingSettings.vue b/apps/frontend/src/components/forms/unterveranstaltung/FormUnterveranstaltungLandingSettings.vue
index 0ba156ea..1f191f3f 100644
--- a/apps/frontend/src/components/forms/unterveranstaltung/FormUnterveranstaltungLandingSettings.vue
+++ b/apps/frontend/src/components/forms/unterveranstaltung/FormUnterveranstaltungLandingSettings.vue
@@ -152,7 +152,6 @@ async function onFileChanged($event: Event) {
 async function deleteHeroImages(image, index) {
   heroImages.value.splice(index, 1)
   if (!image.added) {
-    console.log('deleteHeroImages', image)
     deletedHeroImagesIds.value.push(image.id)
   }
 }
diff --git a/apps/frontend/src/views/Anmeldung/FotoUpload.vue b/apps/frontend/src/views/Anmeldung/FotoUpload.vue
index 83cddbca..70dba903 100644
--- a/apps/frontend/src/views/Anmeldung/FotoUpload.vue
+++ b/apps/frontend/src/views/Anmeldung/FotoUpload.vue
@@ -7,12 +7,18 @@ import Loading from '@/components/UIComponents/Loading.vue'
 import { handlePublicPhotoUpload } from '@/helpers/handleUpload'
 import { injectUnterveranstaltung } from '@/layouts/AnmeldungLayout.vue'
 import { useAsyncState } from '@vueuse/core'
-import { ref, watch } from 'vue'
+import { computed, ref, useTemplateRef, watch } from 'vue'
+import { dayjs } from '@codeanker/helpers'
+import cn from '@/helpers/cn'
 
 const route = useRoute()
 
+const uploader = useTemplateRef('uploader')
+
 const unterveranstaltung = injectUnterveranstaltung()
 
+const meldeschlussErreicht = computed(() => dayjs().isAfter(unterveranstaltung.value.meldeschluss))
+
 const anmeldungId = route.params.anmeldungId as string
 const accessToken = route.query.accessToken as string
 
@@ -27,14 +33,32 @@ const { state, execute, error } = useAsyncState(
   { immediate: false }
 )
 
+const { state: currentPhotoUrl, execute: loadPhoto } = useAsyncState(
+  async () => {
+    if (!state.value?.person.photoId) {
+      return null
+    }
+    return await apiClient.file.fileGetUrl.query({ id: state.value.person.photoId })
+  },
+  null,
+  { immediate: false }
+)
+
 watch(unterveranstaltung, (unterveranstaltung) => {
   if (unterveranstaltung) {
     execute()
   }
 })
 
+watch(state, (state) => {
+  if (state?.person.photoId) {
+    loadPhoto()
+  }
+})
+
 const uploadPending = ref(false)
 const uploadSuccess = ref(false)
+const uploadError = ref<Error>()
 async function upload(toUploadFile: File) {
   uploadPending.value = true
   try {
@@ -43,16 +67,20 @@ async function upload(toUploadFile: File) {
       anmeldungId: parseInt(anmeldungId),
       accessToken,
     })
-    console.log(res)
     await apiClient.anmeldung.anmeldungFotoUpload.mutate({
       unterveranstaltungId: unterveranstaltung.value.id,
       anmeldungId: parseInt(anmeldungId),
       accessToken,
       fileId: res.id,
     })
+    await execute()
+    await loadPhoto()
     uploadSuccess.value = true
   } catch (error) {
     console.error(error)
+    if (error instanceof Error) {
+      uploadError.value = error
+    }
   }
   uploadPending.value = false
 }
@@ -60,17 +88,12 @@ async function upload(toUploadFile: File) {
 
 <template>
   <div class="container mx-auto grow">
-    <p class="text-lg font-bold">Fotoupload</p>
-
     <template v-if="error">
       <p class="text-lg font-medium">Ein Fehler ist aufgetreten</p>
       <p class="text-red-600 font-medium">
         {{ error }}
       </p>
     </template>
-    <template v-else-if="uploadSuccess">
-      <p>Das Bild wurde hochgeladen!</p>
-    </template>
     <template v-else-if="state === undefined">
       <p>Lade Daten …</p>
       <Loading />
@@ -78,37 +101,108 @@ async function upload(toUploadFile: File) {
     <template v-else-if="state === null">
       Die angegeben Daten konnten nicht verifiziert werden. Wahrscheinlich ist der Zugangstoken falsch!
     </template>
-    <template v-else>
-      <p>
-        Vielen Dank für die Anmeldung von <u>{{ state.person.firstname }} {{ state.person.lastname }}</u> zur
-        Veranstaltung <u>{{ state.unterveranstaltung.veranstaltung.name }}</u>
-      </p>
+    <div
+      v-else
+      class="flex flex-col gap-y-12 md:flex-row md:gap-x-12 lg:gap-x-24"
+    >
+      <div class="grow">
+        <p class="text-lg font-bold">Fotoupload</p>
+        <p>
+          Vielen Dank für die Anmeldung von <u>{{ state.person.firstname }} {{ state.person.lastname }}</u> zur
+          Veranstaltung <u>{{ state.unterveranstaltung.veranstaltung.name }}</u
+          >.
+        </p>
+
+        <template v-if="meldeschlussErreicht">
+          <p class="text-red-500">Leider ist der Meldeschluss bereits erreicht.</p>
+        </template>
+        <template v-else>
+          <p>
+            Lade hier ein Bild von <u>{{ state.person.firstname }} {{ state.person.lastname }}</u> hoch. Dieses wird
+            dann bspw. für Teilnehmendenausweise verwendet.
+          </p>
+          <p>
+            <strong>Wichtig:</strong> Bitte achte darauf, dass das Foto möglichst quadratisch ist (gleiche Höhe wie
+            Breite).
+          </p>
+
+          <div
+            v-if="uploadPending"
+            class="flex flex-col text-justify-center items-center"
+          >
+            <Loading size="md" />
+            <span>dein Bild wird hochgeladen</span>
+          </div>
+          <div v-else-if="uploadError">
+            <p class="text-red-500">{{ uploadError.message }}</p>
+          </div>
+          <template v-else-if="uploadSuccess">
+            <p class="text-primary-500">Das Bild wurde hochgeladen!</p>
+          </template>
 
-      <div class="mb-6 flex justify-between">
-        <button
-          type="button"
-          class="btn btn-link -mr-3 -mt-1 px-3 py-1"
-        >
-          <i class="fas fa-times" />
-        </button>
+          <div class="mb-6 flex justify-between">
+            <button
+              type="button"
+              class="btn btn-link -mr-3 -mt-1 px-3 py-1"
+            >
+              <i class="fas fa-times" />
+            </button>
+          </div>
+
+          <InputFileUploadArea
+            ref="uploader"
+            accept="image/*"
+            :multiple="false"
+            :disabled="uploadPending"
+            upload-text="Bild hier hin ziehen oder klicken."
+            class="w-full"
+            :on-upload="upload"
+          />
+        </template>
       </div>
-      <div class="flex w-full justify-center">
-        <div
-          v-if="uploadPending"
-          class="flex flex-col text-justify-center items-center"
-        >
-          <Loading size="md" />
-          <span>dein Bild wird hochgeladen</span>
-        </div>
-        <InputFileUploadArea
-          v-else
-          accept="image/*"
-          :multiple="false"
-          upload-text="Bild hier hin ziehen oder klicken."
-          class="w-full"
-          @uploaded="upload"
+      <div
+        v-if="currentPhotoUrl"
+        :class="cn({ 'shake opacity-50': uploader?.files.length ?? 0 > 0 })"
+      >
+        <p class="text-md font-medium">Aktuelles Foto</p>
+        <img
+          :src="currentPhotoUrl"
+          class="h-[384px] object-contain object-top drop-shadow-2xl"
         />
       </div>
-    </template>
+    </div>
   </div>
 </template>
+
+<style scoped>
+.shake {
+  animation: shake 0.5s ease-in-out infinite;
+}
+
+@keyframes shake {
+  0% {
+    transform: rotate(0);
+    transform-origin: center;
+  }
+  20% {
+    transform: rotate(-0.5deg);
+    transform-origin: center;
+  }
+  40% {
+    transform: rotate(0.5deg);
+    transform-origin: center;
+  }
+  60% {
+    transform: rotate(-0.5deg);
+    transform-origin: center;
+  }
+  80% {
+    transform: rotate(0.5deg);
+    transform-origin: center;
+  }
+  100% {
+    transform: rotate(0);
+    transform-origin: center;
+  }
+}
+</style>
diff --git a/apps/frontend/src/views/Verwaltung/Accounts/AccountList.vue b/apps/frontend/src/views/Verwaltung/Accounts/AccountList.vue
index ab0fc6b6..0f4e3fdf 100644
--- a/apps/frontend/src/views/Verwaltung/Accounts/AccountList.vue
+++ b/apps/frontend/src/views/Verwaltung/Accounts/AccountList.vue
@@ -171,18 +171,20 @@ function changeTab(index: number) {
             Account anlegen
           </RouterLink>
         </div>
-        <GenericDataGrid
-          :columns="columns"
-          :fetch-page="fetchPage"
-          :fetch-count="fetchCount"
-          :default-filter="defaultFilter"
-          :default-order-by="[]"
-          no-data-message="Es gibt bisher keine Accounts."
-          show-clickable
-          @row-click="
-            (account) => router.push({ name: 'Verwaltung Accountdetails', params: { accountId: account.id } })
-          "
-        />
+        <div class="grid-rows[1fr, 50px] grid flex-grow">
+          <GenericDataGrid
+            :columns="columns"
+            :fetch-page="fetchPage"
+            :fetch-count="fetchCount"
+            :default-filter="defaultFilter"
+            :default-order-by="[]"
+            no-data-message="Es gibt bisher keine Accounts."
+            show-clickable
+            @row-click="
+              (account) => router.push({ name: 'Verwaltung Accountdetails', params: { accountId: account.id } })
+            "
+          />
+        </div>
       </Tab>
       <Tab>
         <div class="my-8 flex justify-between">
diff --git a/apps/frontend/src/views/Verwaltung/Persons/PersonDetail.vue b/apps/frontend/src/views/Verwaltung/Persons/PersonDetail.vue
index 2fc76b25..984620a6 100644
--- a/apps/frontend/src/views/Verwaltung/Persons/PersonDetail.vue
+++ b/apps/frontend/src/views/Verwaltung/Persons/PersonDetail.vue
@@ -41,7 +41,7 @@ const { execute: update } = useAsyncState(
       })
       .map((entry) => entry[0] as NahrungsmittelIntoleranz)
 
-    await apiClient.person.verwaltungPatch.mutate({
+    await apiClient.person.patch.mutate({
       id: person.value!.id,
       data: {
         gliederungId: anmeldung.gliederung.id,
diff --git a/package.json b/package.json
index 40ac46ed..6f338a97 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "codeanker-project",
   "author": "CODEANKER GmbH",
-  "version": "2.0.1",
+  "version": "2.1.1",
   "description": "",
   "license": "CC-BY-3.0-DE",
   "workspaces": [
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ad8f165c..366332ca 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -6,9 +6,6 @@ settings:
 
 catalogs:
   default:
-    '@eslint/js':
-      specifier: ^9.17.0
-      version: 9.19.0
     '@tiptap/extension-document':
       specifier: ^2.11.0
       version: 2.11.5
@@ -36,9 +33,6 @@ catalogs:
     '@trpc/client':
       specifier: 11.0.0-rc.682
       version: 11.0.0-rc.682
-    '@trpc/server':
-      specifier: 11.0.0-rc.682
-      version: 11.0.0-rc.682
     '@types/node':
       specifier: ^22.10.2
       version: 22.10.2
@@ -51,9 +45,6 @@ catalogs:
     typescript:
       specifier: ^5.7.2
       version: 5.7.2
-    typescript-eslint:
-      specifier: ^8.18.2
-      version: 8.18.2
     vue:
       specifier: ^3.5.13
       version: 3.5.13
@@ -334,6 +325,9 @@ importers:
       http2-proxy:
         specifier: ^5.0.53
         version: 5.0.53
+      human-filetypes:
+        specifier: ^1.1.3
+        version: 1.1.3
       intl-tel-input:
         specifier: ^24.4.0
         version: 24.8.2
@@ -3321,6 +3315,9 @@ packages:
     resolution: {integrity: sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==}
     engines: {node: '>= 14'}
 
+  human-filetypes@1.1.3:
+    resolution: {integrity: sha512-vtGxjtt0pdKULyCD3juFr0gjxSU3tJb995/oZN84LHP45HGryg1/2xJCLvoKw6zEpWfVCZiFNaGLOF16u28Bbg==}
+
   husky@8.0.3:
     resolution: {integrity: sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==}
     engines: {node: '>=14'}
@@ -7822,6 +7819,8 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  human-filetypes@1.1.3: {}
+
   husky@8.0.3: {}
 
   iconv-lite@0.4.24: