diff --git a/helm/stack-data-ums/data-files/default/41-selfservice-portal.yaml b/helm/stack-data-ums/data-files/default/41-selfservice-portal.yaml
index 82f8088..943add5 100644
--- a/helm/stack-data-ums/data-files/default/41-selfservice-portal.yaml
+++ b/helm/stack-data-ums/data-files/default/41-selfservice-portal.yaml
@@ -4,6 +4,29 @@
 {{ with .Values.stackDataContext }}
 
 
+
+---
+action: "create"
+module: "portals/entry"
+position: "cn=entry,cn=portals,cn=univention,{{ include "stack-data-ums.ldapBaseDn" $ }}"
+properties:
+  name: "self-service-password-change"
+  icon: {{ $.Files.Get "data-files/default/selfservice-icons/passwordchange.svg" | b64enc | quote }}
+  activated: True
+  anonymous: False
+  linkTarget: "samewindow"
+  allowedGroups:
+{{ toYaml .portaltileGroupUserStandard | indent 4 }}
+  displayName:
+    en_US: "Change your password"
+    de_DE: "Ihr Passwort ändern"
+  description:
+    en_US: "Change your password"
+    de_DE: "Ihr Passwort ändern"
+  link:
+    - - "en_US"
+      - "#/selfservice/passwordchange"
+
 ---
 action: "create"
 module: "portals/entry"
@@ -58,7 +81,7 @@ properties:
     de_DE: "Kontozugang schützen"
   link:
     - - "en_US"
-      - '#/selfservice/protectaccount'
+      - "#/selfservice/protectaccount"
 ---
 action: "create"
 module: "portals/entry"
@@ -92,10 +115,9 @@ properties:
   entries:
     - "cn=self-service-protect-account,cn=entry,cn=portals,cn=univention,{{ include "stack-data-ums.ldapBaseDn" $ }}"
     - "cn=self-service-password-forgotten,cn=entry,cn=portals,cn=univention,{{ include "stack-data-ums.ldapBaseDn" $ }}"
-
+    - "cn=self-service-password-change,cn=entry,cn=portals,cn=univention,{{ include "stack-data-ums.ldapBaseDn" $ }}"
 
 ---
-# Create the portal with the categories above
 action: "create"
 module: "portals/portal"
 position: "cn=portal,cn=portals,cn=univention,{{ include "stack-data-ums.ldapBaseDn" $ }}"
@@ -113,10 +135,11 @@ properties:
 ---
 action: "ensure_list_contains"
 module: "portals/portal"
-position: "cn=self-service,cn=portal,cn=portals,cn=univention,{{ include "stack-data-ums.ldapBaseDn" $ }}"
+position: "cn=domain,cn=portal,cn=portals,cn=univention,{{ include "stack-data-ums.ldapBaseDn" $ }}"
 properties:
   userLinks:
     - "cn=self-service-protect-account,cn=entry,cn=portals,cn=univention,{{ include "stack-data-ums.ldapBaseDn" $ }}"
     - "cn=self-service-password-forgotten,cn=entry,cn=portals,cn=univention,{{ include "stack-data-ums.ldapBaseDn" $ }}"
+    - "cn=self-service-password-change,cn=entry,cn=portals,cn=univention,{{ include "stack-data-ums.ldapBaseDn" $ }}"
     - "cn=self-service-my-profile,cn=entry,cn=portals,cn=univention,{{ include "stack-data-ums.ldapBaseDn" $ }}"
 {{ end }}
diff --git a/helm/stack-data-ums/data-files/default/selfservice-icons/passwordchange.svg b/helm/stack-data-ums/data-files/default/selfservice-icons/passwordchange.svg
new file mode 100644
index 0000000..db2119c
--- /dev/null
+++ b/helm/stack-data-ums/data-files/default/selfservice-icons/passwordchange.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#ffffff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-key"><path d="M21 2l-2 2m-7.61 7.61a5.5 5.5 0 1 1-7.778 7.778 5.5 5.5 0 0 1 7.777-7.777zm0 0L15.5 7.5m0 0l3 3L22 7l-3-3m-3.5 3.5L19 4"></path></svg>