diff --git a/.changes/unreleased/Fixed-20250611-164623.yaml b/.changes/unreleased/Fixed-20250611-164623.yaml
new file mode 100644
index 000000000..8bb956c34
--- /dev/null
+++ b/.changes/unreleased/Fixed-20250611-164623.yaml
@@ -0,0 +1,6 @@
+kind: Fixed
+body: Fix admin entity edit actions for event admin entities and activity reason (category) entities
+time: 2025-06-11T16:46:23.113506434+02:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change
diff --git a/.changes/unreleased/UX-20250617-192650.yaml b/.changes/unreleased/UX-20250617-192650.yaml
new file mode 100644
index 000000000..810758b10
--- /dev/null
+++ b/.changes/unreleased/UX-20250617-192650.yaml
@@ -0,0 +1,6 @@
+kind: UX
+body: Improve labeling of fields in person resource creation form
+time: 2025-06-17T19:26:50.599703116+02:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php
index 0167273c5..7512b21ed 100644
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php
@@ -17,7 +17,6 @@ use Chill\ActivityBundle\Repository\ActivityReasonRepository;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * ActivityReason controller.
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/UserRenderBoxBadge.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/UserRenderBoxBadge.vue
index 4645f322d..63c43c37f 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/UserRenderBoxBadge.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/UserRenderBoxBadge.vue
@@ -1,11 +1,11 @@
 <template>
     <span class="chill-entity entity-user">
         {{ user.label }}
-        <span class="user-job" v-if="user.user_job !== null"
-            > ({{ localizeString(user.user_job.label) }})</span
+        <span class="user-job" v-if="user.user_job !== null">
+            ({{ localizeString(user.user_job.label) }})</span
         >
-        <span class="main-scope" v-if="user.main_scope !== null"
-            > ({{ localizeString(user.main_scope.name) }})</span
+        <span class="main-scope" v-if="user.main_scope !== null">
+            ({{ localizeString(user.main_scope.name) }})</span
         >
         <span
             v-if="user.isAbsent"
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav.vue
index 65e980fb0..890aa5153 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav.vue
@@ -120,7 +120,7 @@ export default {
 
             return pos;
         },
-        handleScroll(event) {
+        handleScroll() {
             let pos = this.findPos(this.stickyNav);
             let top = this.heightSum + this.top - window.scrollY;
             //console.log(window.scrollY);
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
index 326e810e9..b54baf09a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
@@ -79,8 +79,9 @@
                             {{ $t("select_time_spent") }}
                         </option>
                         <option
-                            v-for="time in timeSpentChoices"
+                            v-for="(time, i) in timeSpentChoices"
                             :value="time.value"
+                            :key="i"
                         >
                             {{ time.text }}
                         </option>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriod/SetReferrer.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriod/SetReferrer.vue
index 068b2068b..8391fbbb6 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriod/SetReferrer.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriod/SetReferrer.vue
@@ -39,7 +39,7 @@ export default {
             };
 
             return makeFetch("PATCH", url, body)
-                .then((response) => {
+                .then(() => {
                     this.$emit("referrerSet", ref);
                 })
                 .catch((error) => {
diff --git a/src/Bundle/ChillWopiBundle/src/Resources/public/module/pending/index.ts b/src/Bundle/ChillWopiBundle/src/Resources/public/module/pending/index.ts
index 98dbac4d4..faeb00540 100644
--- a/src/Bundle/ChillWopiBundle/src/Resources/public/module/pending/index.ts
+++ b/src/Bundle/ChillWopiBundle/src/Resources/public/module/pending/index.ts
@@ -1,8 +1,6 @@
 import { is_object_ready } from "../../../../../../ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/helpers";
 import {
     StoredObject,
-    StoredObjectStatus,
-    StoredObjectStatusChange,
 } from "../../../../../../ChillDocStoreBundle/Resources/public/types";
 
 async function reload_if_needed(