diff --git a/private/minis-backend/src/main/kotlin/de/walamana/views/AuthenticationView.kt b/private/minis-backend/src/main/kotlin/de/walamana/views/AuthenticationView.kt
index 766ae76..8a5f1ee 100644
--- a/private/minis-backend/src/main/kotlin/de/walamana/views/AuthenticationView.kt
+++ b/private/minis-backend/src/main/kotlin/de/walamana/views/AuthenticationView.kt
@@ -34,6 +34,7 @@ data class AuthenticationResult(
 
 @Serializable
 data class AuthenticationUpdateRequest(
+    val username: String?,
     val newPassword: String
 )
 
@@ -70,7 +71,11 @@ fun Route.configureAuthenticationRoutes() {
                 val principal = call.principal<JWTPrincipal>()!!
                 val request = call.receive<AuthenticationUpdateRequest>()
 
-                Security.setPassword(principal.payload.username(), request.newPassword)
+                val username = if(request.username != null && principal.payload.username() == "admin") {
+                    request.username
+                } else principal.payload.username()
+
+                Security.setPassword(username, request.newPassword)
 
                 call.respond(hashMapOf("success" to true))
             }
@@ -92,8 +97,6 @@ fun Route.configureAuthenticationRoutes() {
 
 
                 call.respond(hashMapOf("password" to newPassword))
-
-
             }
         }
     }
diff --git a/public/src/components/dialog/CreateMinistrantDialog.vue b/public/src/components/dialog/CreateMinistrantDialog.vue
index cec3f23..f6f80d3 100644
--- a/public/src/components/dialog/CreateMinistrantDialog.vue
+++ b/public/src/components/dialog/CreateMinistrantDialog.vue
@@ -7,6 +7,7 @@ import {ref, toRaw} from "vue";
 import {onKeyPress} from "@/composables/enter";
 import {API} from "@/services/api";
 import {Dialogs} from "@/services/DialogService";
+import UpdatePasswordDialog from "@/components/dialog/UpdatePasswordDialog.vue";
 interface CreateMinistrantDialogProps extends DialogControls {
     onCreate: (any) => (Promise<any> | undefined),
     onDelete: (id) => (Promise<any> | undefined),
@@ -62,6 +63,23 @@ async function resetPassword(username: string) {
     console.log(result)
 }
 
+async function updatePassword(username: string) {
+    Dialogs.createDialog(
+        UpdatePasswordDialog,
+        {
+            onDismiss(){},
+            onNegative(){},
+            onPositive(){},
+        },
+        {
+            async onUpdated(newPassword: string){
+                await API.updatePassword(username, newPassword)
+            },
+            username
+        }
+    )
+}
+
 </script>
 
 <template>
@@ -75,7 +93,9 @@ async function resetPassword(username: string) {
         <Input class="input" v-model:value="ministrant.privileges" label="Privilegien"/>
 
         <div class="actions" v-if="ministrant.id != -1">
-            <button @click="resetPassword(ministrant.username)"><i>lock_reset</i>Passwort zurücksetzen
+<!--            <button @click="resetPassword(ministrant.username)"><i>lock_reset</i>Passwort zurücksetzen-->
+<!--            </button>-->
+            <button @click="updatePassword(ministrant.username)"><i>lock_reset</i>Passwort ändern
             </button>
             <button class="red" @click="deleteMinistrant()"><i>delete</i>Entfernen</button>
         </div>
diff --git a/public/src/components/dialog/UpdatePasswordDialog.vue b/public/src/components/dialog/UpdatePasswordDialog.vue
new file mode 100644
index 0000000..1167c44
--- /dev/null
+++ b/public/src/components/dialog/UpdatePasswordDialog.vue
@@ -0,0 +1,61 @@
+<script setup lang="ts">
+import type {DialogControls} from "@/components/dialog/dialog";
+import Dialog from "@/components/dialog/Dialog.vue";
+import Input from "@/components/Input.vue";
+import {ref} from "vue";
+
+interface UpdatePasswordDialogProps extends DialogControls {
+    username: string,
+    onUpdated: (newPassword: string) => (Promise<any> | undefined)
+}
+
+const props = defineProps<UpdatePasswordDialogProps>()
+
+const newPassword = ref("")
+const newPasswordCheck = ref("")
+
+function updatePassword() {
+    if(newPassword.value !== newPasswordCheck.value) {
+        alert("Beide Passwörter müssen gleich sein!")
+        return
+    }
+
+    props.onUpdated(newPassword.value)
+    props.onPositive()
+}
+
+</script>
+
+<template>
+    <Dialog class="dialog">
+
+        <h3>Passwort zurücksetzen</h3>
+
+        <Input class="input" v-model:value="newPassword" type="password" label="Neues Passwort"/>
+        <Input class="input" v-model:value="newPasswordCheck" type="password" label="Wiederholen"/>
+
+
+        <div class="buttons" style="display: flex; justify-content: end; margin-top: 20px;">
+            <button @click="onDismiss">Abbrechen</button>
+            <button @click="updatePassword">Passwort speichern</button>
+        </div>
+
+    </Dialog>
+</template>
+
+<style scoped lang="less">
+
+.dialog {
+    display: flex;
+    flex-direction: column;
+    width: 500px;
+
+    h3{
+        margin-bottom: 30px;
+    }
+
+    .input {
+        margin-bottom: 16px;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/public/src/services/api.ts b/public/src/services/api.ts
index 659aef5..7706adf 100644
--- a/public/src/services/api.ts
+++ b/public/src/services/api.ts
@@ -134,6 +134,11 @@ export namespace API {
             .then(res => res.json())
     }
 
+    export async function updatePassword(username: String, newPassword: string): Promise<any> {
+        return api("/auth/update", "PUT", { username, newPassword })
+            .then(res => res.json())
+    }
+
 }