diff --git a/src/components/ChangePasswordForm.tsx b/src/components/ChangePasswordForm.tsx
new file mode 100644
index 0000000..c610809
--- /dev/null
+++ b/src/components/ChangePasswordForm.tsx
@@ -0,0 +1,120 @@
+import { BadRequest, type FeathersError } from "@feathersjs/errors"
+import React, { useEffect, useRef, useState } from "react"
+import { Form } from "react-bootstrap"
+import ErrorManager, { type BadRequestData } from "./ErrorManager"
+import { FloppyDiskArrowIn } from "iconoir-react"
+
+export type ChangePasswordFormPayload = {
+  currentPassword: string
+  password: string
+  verifyPassword: string
+}
+
+export interface ChangePasswordFormProps {
+  className?: string
+  onSubmit: (payload: ChangePasswordFormPayload) => void
+  error?: FeathersError | null
+}
+
+const ChangePasswordForm: React.FC<ChangePasswordFormProps> = ({
+  className,
+  onSubmit,
+  error,
+}) => {
+  const delayTimerRef = useRef<NodeJS.Timeout | null>(null)
+  const [formError, setFormError] = useState<Error | null>(null)
+
+  const formPayload = useRef<ChangePasswordFormPayload>({
+    currentPassword: "",
+    password: "",
+    verifyPassword: "",
+  })
+
+  const handleOnSubmit = (e: React.FormEvent<HTMLFormElement>) => {
+    e.preventDefault()
+    console.info("[ChangePasswordForm] @handleOnSubmit")
+    const errorsAsData: { [key: string]: BadRequestData } = {}
+    if (formPayload.current.password !== formPayload.current.verifyPassword) {
+      errorsAsData.verifyPassword = {
+        label: "Verify password",
+        message: "The passwords you entered don't match. Please try again.",
+      }
+    }
+    if (Object.keys(errorsAsData).length > 0) {
+      setFormError(new BadRequest("Please check your entries.", errorsAsData))
+      return false
+    }
+    onSubmit(formPayload.current)
+  }
+
+  const updateValue = (key: keyof ChangePasswordFormPayload, value: string) => {
+    formPayload.current[key] = value
+    console.info("[RegisterForm] @updatePreview", key, value)
+    // handpick the fields to preview
+    delayTimerRef.current = setTimeout(() => {
+      setFormError(null)
+    }, 400)
+  }
+
+  console.info("[ChangePasswordForm] @render", { error })
+
+  useEffect(() => {
+    return () => {
+      if (delayTimerRef.current) {
+        clearTimeout(delayTimerRef.current)
+      }
+    }
+  }, [])
+
+  return (
+    <>
+      <Form
+        onSubmit={handleOnSubmit}
+        className={`ChangePasswordForm ${className}`}
+      >
+        <ErrorManager error={error || formError} />
+
+        <Form.Group
+          className="mb-3"
+          controlId="ModalChangePasswordorm.password"
+        >
+          <Form.Label className="font-weight-bold">Current Password</Form.Label>
+          <Form.Control
+            onChange={(e) => updateValue("currentPassword", e.target.value)}
+            type="password"
+          />
+        </Form.Group>
+        <Form.Group className="mb-3" controlId="ModalChangePassword.password">
+          <Form.Label className="font-weight-bold">New Password</Form.Label>
+          <Form.Control
+            onChange={(e) => updateValue("password", e.target.value)}
+            type="password"
+          />
+        </Form.Group>
+        <Form.Group
+          className="mb-3"
+          controlId="ModalChangePassword.verifyPassword"
+        >
+          <Form.Label className="font-weight-bold">
+            Verify New Password
+          </Form.Label>
+          <Form.Control
+            onChange={(e) => updateValue("verifyPassword", e.target.value)}
+            type="password"
+          />
+        </Form.Group>
+        <button type="submit" className="btn btn-primary btn-lg px-4">
+          <FloppyDiskArrowIn /> <span className="ms-2">Register</span>
+        </button>
+      </Form>
+
+      <p className="mt-2">
+        Any Questions? <br />
+        Contact us at{" "}
+        <a href="mailto:info@impresso-project.ch">info@impresso-project.ch</a>
+      </p>
+    </>
+  )
+}
+
+export default ChangePasswordForm
diff --git a/src/components/ChangePasswordModal.tsx b/src/components/ChangePasswordModal.tsx
new file mode 100644
index 0000000..8de8808
--- /dev/null
+++ b/src/components/ChangePasswordModal.tsx
@@ -0,0 +1,53 @@
+import { Col, Container, Form, Modal, Row } from "react-bootstrap"
+import { BrowserViewChangePassword } from "../constants"
+import { useBrowserStore } from "../store"
+import Alert from "./Alert"
+import { useRef, useState } from "react"
+import ChangePasswordForm, {
+  type ChangePasswordFormPayload,
+} from "./ChangePasswordForm"
+import type { FeathersError } from "@feathersjs/errors"
+import { changePasswordService } from "../services"
+
+const ChangePassword = () => {
+  const view = useBrowserStore((state) => state.view)
+  const setView = useBrowserStore((state) => state.setView)
+  const [error, setError] = useState<FeathersError | null>(null)
+
+  const handleOnSubmit = (payload: ChangePasswordFormPayload) => {
+    console.info("[ChangePasswordModal] @handleOnSubmit", payload)
+    changePasswordService
+      .create({
+        password: payload.password,
+        currentPassword: payload.currentPassword,
+      })
+      .then((data) => {
+        console.info(
+          "[ChangePasswordModal] Password changed successfully. data:",
+          data
+        )
+        setView(null)
+      })
+      .catch((err: FeathersError) => {
+        setError(err)
+        console.error("[ChangePasswordModal] create", err.message, err.data)
+      })
+  }
+
+  return (
+    <Modal
+      centered
+      show={view === BrowserViewChangePassword}
+      onHide={() => setView(null)}
+    >
+      <Modal.Header closeButton>
+        <Modal.Title>Change Password</Modal.Title>
+      </Modal.Header>
+      <Modal.Body className="p-3">
+        <ChangePasswordForm onSubmit={handleOnSubmit} error={error} />
+      </Modal.Body>
+    </Modal>
+  )
+}
+
+export default ChangePassword
diff --git a/src/components/Modals.tsx b/src/components/Modals.tsx
index 8496b72..b663c70 100644
--- a/src/components/Modals.tsx
+++ b/src/components/Modals.tsx
@@ -3,15 +3,17 @@ import LoginModal from "./LoginModal"
 import RegisterModal from "./RegisterModal"
 import ProfileModal from "./ProfileModal"
 import TermsOfUseModal from "./TermsOfUseModal"
+import ChangePasswordModal from "./ChangePasswordModal"
 
 const Modals: React.FC<{ termsOfuseContent?: string }> = ({
-  termsOfuseContent='',
+  termsOfuseContent = "",
 }) => {
   return (
     <div className="Modals">
       <LoginModal />
       <RegisterModal />
       <ProfileModal />
+      <ChangePasswordModal />
       <ConfirmRegistrationModal />
       <TermsOfUseModal content={termsOfuseContent} autoOpenAfterDelay={false} />
     </div>
diff --git a/src/components/UserArea.tsx b/src/components/UserArea.tsx
index 01b1ef8..fca8705 100644
--- a/src/components/UserArea.tsx
+++ b/src/components/UserArea.tsx
@@ -5,6 +5,7 @@ import { userService } from "../services"
 import { forwardRef, useEffect } from "react"
 import { PageDown } from "iconoir-react"
 import {
+  BrowserViewChangePassword,
   BrowserViewLogin,
   BrowserViewProfile,
   BrowserViewRegister,
@@ -91,13 +92,21 @@ const UserArea = () => {
               <Dropdown.Item onClick={() => setView(BrowserViewProfile)}>
                 Profile
               </Dropdown.Item>
-              <Dropdown.Item href="/datalab/datasets">Datasets</Dropdown.Item>
-              <Dropdown.Item onClick={() => setView(BrowserViewTermsOfUse)}>
-                Terms Of Use
+              <Dropdown.Item onClick={() => setView(BrowserViewChangePassword)}>
+                Change Password
               </Dropdown.Item>
               <Dropdown.Item onClick={logout}>Log out</Dropdown.Item>
               {/* add separator */}
               <Dropdown.Divider />
+              {/* add separator */}
+              <Dropdown.Divider />
+              <Dropdown.Item href="/datalab/corpus-overview">
+                Corpus Overview
+              </Dropdown.Item>
+              <Dropdown.Item onClick={() => setView(BrowserViewTermsOfUse)}>
+                Terms Of Use
+              </Dropdown.Item>
+
               <Dropdown.Item
                 target="_blank"
                 href="https://join.slack.com/t/impresso-community/shared_invite/enQtNTg5MzY2NDg2NTAyLTdiMmI2ZWU5ZjliNGNjN2M4NTgxM2UzOTQyYTkxYWU4MTgwN2I1MzQxMzg3N2Y0NGU3OGFjMzFmMGIyNGRlZmQ"
diff --git a/src/constants.ts b/src/constants.ts
index e5bb386..ade0203 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -206,10 +206,12 @@ export const BrowserViewRegister = "signup"
 export const BrowserViewConfirmRegistration = "confirm-registration"
 export const BrowserViewTermsOfUse = "terms-of-use"
 export const BrowserViewProfile = "profile"
+export const BrowserViewChangePassword = "change-password"
 export const BrowserViews: string[] = [
   BrowserViewLogin,
   BrowserViewRegister,
   BrowserViewProfile,
+  BrowserViewChangePassword,
 ]
 
 export const BrowserWsStatusIdle = "idle"
diff --git a/src/services.tsx b/src/services.tsx
index 91ee5c9..d93fbb1 100644
--- a/src/services.tsx
+++ b/src/services.tsx
@@ -88,5 +88,6 @@ socket.on("reconnect", (attemptNumber) => {
 export const versionService = app.service("version")
 export const userService = app.service("me")
 export const usersService = app.service("users")
+export const changePasswordService = app.service("change-password")
 export const termsOfUseService = app.service("terms-of-use")
 export const loginService = app.service("authentication")
diff --git a/src/styles/global.css b/src/styles/global.css
index a66ed34..9777eba 100644
--- a/src/styles/global.css
+++ b/src/styles/global.css
@@ -524,7 +524,7 @@ hr {
 }
 a.dropdown-item {
   position: relative;
-  display: block;
+  display: inline-block;
   width: auto;
 }
 a.dropdown-item::after {