diff --git a/changelog/unreleased/enhancement-password-generator-for-public-links b/changelog/unreleased/enhancement-password-generator-for-public-links
new file mode 100644
index 00000000000..627d5ee64e7
--- /dev/null
+++ b/changelog/unreleased/enhancement-password-generator-for-public-links
@@ -0,0 +1,9 @@
+Enhancement: Password generator for public links
+
+We've added a new button on the password input field for public links,
+clicking on that button will fill the input with a generated password.
+
+If a password policy is set, those rules will also be applied.
+
+https://github.com/owncloud/web/pull/9691
+https://github.com/owncloud/web/issues/9666
diff --git a/packages/design-system/src/components/OcModal/OcModal.vue b/packages/design-system/src/components/OcModal/OcModal.vue
index b89ed676cb5..ddef2dc2bb5 100644
--- a/packages/design-system/src/components/OcModal/OcModal.vue
+++ b/packages/design-system/src/components/OcModal/OcModal.vue
@@ -44,6 +44,7 @@
               :label="inputLabel"
               :type="inputType"
               :password-policy="inputPasswordPolicy"
+              :generate-password-method="inputGeneratePasswordMethod"
               :description-message="inputDescription"
               :disabled="inputDisabled"
               :fix-message-line="true"
@@ -371,6 +372,14 @@ export default defineComponent({
       required: false,
       default: () => ({})
     },
+    /**
+     * Method to generate random password for the input
+     */
+    inputGeneratePasswordMethod: {
+      type: Function as PropType<(...args: unknown[]) => string>,
+      required: false,
+      default: null
+    },
     /**
      * Overwrite default focused element
      * Can be `#id, .class`.
diff --git a/packages/design-system/src/components/OcTextInput/OcTextInput.spec.ts b/packages/design-system/src/components/OcTextInput/OcTextInput.spec.ts
index c65c2b5b279..a1af8396070 100644
--- a/packages/design-system/src/components/OcTextInput/OcTextInput.spec.ts
+++ b/packages/design-system/src/components/OcTextInput/OcTextInput.spec.ts
@@ -56,7 +56,8 @@ describe('OcTextInput', () => {
     inputField: '.oc-text-input',
     infoIcon: '.oc-text-input-message .oc-icon',
     showPasswordToggleBtn: '.oc-text-input-show-password-toggle',
-    copyPasswordBtn: '.oc-text-input-copy-password-button'
+    copyPasswordBtn: '.oc-text-input-copy-password-button',
+    generatePasswordBtn: '.oc-text-input-generate-password-button'
   }
 
   describe('id prop', () => {
@@ -121,6 +122,30 @@ describe('OcTextInput', () => {
         expect(wrapper.find(selectors.inputField).attributes().type).toBe('password')
       })
     })
+    describe('generate password button', () => {
+      it('should not exist if type is not "password" or prop "generatePasswordMethod" is not provided', () => {
+        const wrapper = getMountedWrapper()
+        expect(wrapper.find(selectors.generatePasswordBtn).exists()).toBeFalsy()
+
+        const wrapper2 = getMountedWrapper({ props: { type: 'password' } })
+        expect(wrapper2.find(selectors.generatePasswordBtn).exists()).toBeFalsy()
+      })
+      it('should exist if type is "password" and prop "generatePasswordMethod" is provided', () => {
+        const wrapper = getMountedWrapper({
+          props: { generatePasswordMethod: jest.fn(), type: 'password' }
+        })
+        expect(wrapper.find(selectors.generatePasswordBtn).exists()).toBeTruthy()
+      })
+      it('should fill input with generated password if clicked', async () => {
+        const wrapper = getMountedWrapper({
+          props: { generatePasswordMethod: jest.fn(() => 'PAssword12#!'), type: 'password' }
+        })
+        await wrapper.find(selectors.generatePasswordBtn).trigger('click')
+        expect((wrapper.find(selectors.inputField).element as HTMLInputElement).value).toEqual(
+          'PAssword12#!'
+        )
+      })
+    })
     describe('password policy', () => {
       it('should emit "passwordChallengeFailed" if password does not match criteria', async () => {
         const wrapper = getMountedWrapper(
diff --git a/packages/design-system/src/components/OcTextInput/OcTextInput.vue b/packages/design-system/src/components/OcTextInput/OcTextInput.vue
index bbb67cce3ea..e1e6897f900 100644
--- a/packages/design-system/src/components/OcTextInput/OcTextInput.vue
+++ b/packages/design-system/src/components/OcTextInput/OcTextInput.vue
@@ -232,6 +232,14 @@ export default defineComponent({
     passwordPolicy: {
       type: Object as PropType<PasswordPolicy>,
       default: () => ({})
+    },
+    /**
+     * Method to generate random password
+     */
+    generatePasswordMethod: {
+      type: Function as PropType<(...args: unknown[]) => string>,
+      required: false,
+      default: null
     }
   },
   emits: [
@@ -264,6 +272,7 @@ export default defineComponent({
       }
       if (this.type === 'password') {
         additionalAttrs['password-policy'] = this.passwordPolicy
+        additionalAttrs['generate-password-method'] = this.generatePasswordMethod
       }
       // Exclude listeners for events which are handled via methods in this component
       // eslint-disable-next-line no-unused-vars
diff --git a/packages/design-system/src/components/OcTextInput/__snapshots__/OcTextInput.spec.ts.snap b/packages/design-system/src/components/OcTextInput/__snapshots__/OcTextInput.spec.ts.snap
index 6060716133e..74a0684260c 100644
--- a/packages/design-system/src/components/OcTextInput/__snapshots__/OcTextInput.spec.ts.snap
+++ b/packages/design-system/src/components/OcTextInput/__snapshots__/OcTextInput.spec.ts.snap
@@ -2,25 +2,26 @@
 
 exports[`OcTextInput password input field password policy displays error state if password does not match criteria 1`] = `
 <div class="">
-  <label class="oc-label" for="oc-textinput-17"></label>
+  <label class="oc-label" for="oc-textinput-21"></label>
   <div class="oc-position-relative">
     <!--v-if-->
     <div class="oc-text-input-password-wrapper">
-      <input aria-invalid="false" class="oc-text-input oc-input oc-rounded" id="oc-textinput-17" type="password">
-      <button class="oc-button oc-rounded oc-button-s oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-text-input-copy-password-button oc-px-s oc-background-default" type="button">
+      <input aria-invalid="false" class="oc-text-input oc-input oc-rounded" id="oc-textinput-21" type="password">
+      <button class="oc-button oc-rounded oc-button-s oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-text-input-show-password-toggle oc-px-s oc-background-default" type="button">
         <!--v-if-->
         <!-- @slot Content of the button -->
         <span class="oc-icon oc-icon-s oc-icon-passive">
           <!---->
         </span>
       </button>
-      <button class="oc-button oc-rounded oc-button-s oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-text-input-show-password-toggle oc-px-s oc-background-default" type="button">
+      <button class="oc-button oc-rounded oc-button-s oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-text-input-copy-password-button oc-px-s oc-background-default" type="button">
         <!--v-if-->
         <!-- @slot Content of the button -->
         <span class="oc-icon oc-icon-s oc-icon-passive">
           <!---->
         </span>
       </button>
+      <!--v-if-->
     </div>
     <portal to="app.design-system.password-policy">
       <div class="oc-text-small oc-flex oc-flex-column">
@@ -42,25 +43,26 @@ exports[`OcTextInput password input field password policy displays error state i
 
 exports[`OcTextInput password input field password policy displays success state if password matches criteria 1`] = `
 <div class="">
-  <label class="oc-label" for="oc-textinput-18"></label>
+  <label class="oc-label" for="oc-textinput-22"></label>
   <div class="oc-position-relative">
     <!--v-if-->
     <div class="oc-text-input-password-wrapper">
-      <input aria-invalid="false" class="oc-text-input oc-input oc-rounded" id="oc-textinput-18" type="password">
-      <button class="oc-button oc-rounded oc-button-s oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-text-input-copy-password-button oc-px-s oc-background-default" type="button">
+      <input aria-invalid="false" class="oc-text-input oc-input oc-rounded" id="oc-textinput-22" type="password">
+      <button class="oc-button oc-rounded oc-button-s oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-text-input-show-password-toggle oc-px-s oc-background-default" type="button">
         <!--v-if-->
         <!-- @slot Content of the button -->
         <span class="oc-icon oc-icon-s oc-icon-passive">
           <!---->
         </span>
       </button>
-      <button class="oc-button oc-rounded oc-button-s oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-text-input-show-password-toggle oc-px-s oc-background-default" type="button">
+      <button class="oc-button oc-rounded oc-button-s oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-text-input-copy-password-button oc-px-s oc-background-default" type="button">
         <!--v-if-->
         <!-- @slot Content of the button -->
         <span class="oc-icon oc-icon-s oc-icon-passive">
           <!---->
         </span>
       </button>
+      <!--v-if-->
     </div>
     <portal to="app.design-system.password-policy">
       <div class="oc-text-small oc-flex oc-flex-column">
diff --git a/packages/design-system/src/components/_OcTextInputPassword/_OcTextInputPassword.vue b/packages/design-system/src/components/_OcTextInputPassword/_OcTextInputPassword.vue
index ded10248855..9a6c9f30a24 100644
--- a/packages/design-system/src/components/_OcTextInputPassword/_OcTextInputPassword.vue
+++ b/packages/design-system/src/components/_OcTextInputPassword/_OcTextInputPassword.vue
@@ -1,23 +1,40 @@
 <template>
-  <div ref="inputPasswordWrapper" class="oc-text-input-password-wrapper">
-    <input v-bind="$attrs" :type="showPassword ? 'text' : 'password'" @input="onInput" />
+  <div class="oc-text-input-password-wrapper">
+    <input
+      v-bind="$attrs"
+      :type="showPassword ? 'text' : 'password'"
+      v-model="password"
+      @input="onPasswordEntered"
+    />
+    <oc-button
+      v-if="password"
+      class="oc-text-input-show-password-toggle oc-px-s oc-background-default"
+      appearance="raw"
+      size="small"
+      @click="showPassword = !showPassword"
+      v-oc-tooltip="$gettext('Show password')"
+    >
+      <oc-icon size="small" :name="showPassword ? 'eye-off' : 'eye'" />
+    </oc-button>
     <oc-button
       v-if="password"
       class="oc-text-input-copy-password-button oc-px-s oc-background-default"
       appearance="raw"
       size="small"
       @click="copyPasswordToClipboard"
+      v-oc-tooltip="$gettext('Copy password')"
     >
       <oc-icon size="small" :name="copyPasswordIcon" />
     </oc-button>
     <oc-button
-      v-if="password"
-      class="oc-text-input-show-password-toggle oc-px-s oc-background-default"
+      v-if="generatePasswordMethod"
+      class="oc-text-input-generate-password-button oc-px-s oc-background-default"
       appearance="raw"
       size="small"
-      @click="showPassword = !showPassword"
+      @click="showGeneratedPassword"
+      v-oc-tooltip="$gettext('Generate password')"
     >
-      <oc-icon size="small" :name="showPassword ? 'eye-off' : 'eye'" />
+      <oc-icon size="small" name="refresh" fill-type="line" />
     </oc-button>
   </div>
   <portal v-if="showPasswordPolicyInformation" to="app.design-system.password-policy">
@@ -58,31 +75,38 @@ export default defineComponent({
   release: '1.0.0',
   inheritAttrs: true,
   props: {
+    value: {
+      type: String,
+      required: false,
+      default: ''
+    },
     passwordPolicy: {
       type: Object as PropType<PasswordPolicy>,
       default: () => ({})
+    },
+    generatePasswordMethod: {
+      type: Function as PropType<(...args: unknown[]) => string>,
+      required: false,
+      default: null
     }
   },
   emits: ['passwordChallengeCompleted', 'passwordChallengeFailed'],
   setup(props, { emit }) {
     const { $gettext } = useGettext()
+    const password = ref(props.value)
     const showPassword = ref(false)
     const passwordEntered = ref(false)
-    const password = ref('')
     const copyPasswordIconInitial = 'file-copy'
     const copyPasswordIcon = ref(copyPasswordIconInitial)
+
     const showPasswordPolicyInformation = computed(() => {
       return !!(Object.keys(props.passwordPolicy?.rules || {}).length && unref(passwordEntered))
     })
+
     const testedPasswordPolicy = computed(() => {
       return props.passwordPolicy.missing(unref(password))
     })
 
-    const onInput = (event) => {
-      passwordEntered.value = true
-      password.value = event.target.value
-    }
-
     const getPasswordPolicyRuleMessage = (rule) => {
       const paramObj = {}
 
@@ -99,6 +123,16 @@ export default defineComponent({
       setTimeout(() => (copyPasswordIcon.value = copyPasswordIconInitial), 500)
     }
 
+    const showGeneratedPassword = () => {
+      const generatedPassword = props.generatePasswordMethod()
+      password.value = generatedPassword
+      showPassword.value = true
+    }
+
+    const onPasswordEntered = () => {
+      passwordEntered.value = true
+    }
+
     watch(password, (value) => {
       if (!Object.keys(props.passwordPolicy).length) {
         return
@@ -113,14 +147,15 @@ export default defineComponent({
 
     return {
       $gettext,
-      onInput,
       password,
       showPassword,
       showPasswordPolicyInformation,
       testedPasswordPolicy,
       getPasswordPolicyRuleMessage,
       copyPasswordToClipboard,
-      copyPasswordIcon
+      showGeneratedPassword,
+      copyPasswordIcon,
+      onPasswordEntered
     }
   }
 })
diff --git a/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue b/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue
index f1a301c7646..d4a6d1300a3 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue
@@ -475,6 +475,7 @@ export default defineComponent({
         confirmDisabled: true,
         inputLabel: this.$gettext('Password'),
         inputPasswordPolicy: this.passwordPolicyService.getPolicy(),
+        inputGeneratePasswordMethod: () => this.passwordPolicyService.generatePassword(),
         inputPlaceholder: this.link.password ? '●●●●●●●●' : null,
         inputType: 'password',
         onCancel: this.hideModal,
diff --git a/packages/web-app-files/src/quickActions.ts b/packages/web-app-files/src/quickActions.ts
index 899ebdb0549..9bb043add11 100644
--- a/packages/web-app-files/src/quickActions.ts
+++ b/packages/web-app-files/src/quickActions.ts
@@ -27,6 +27,7 @@ export function showQuickLinkPasswordModal({ $gettext, store, passwordPolicyServ
     hasInput: true,
     inputDescription: $gettext('Passwords for links are required.'),
     inputPasswordPolicy: passwordPolicyService.getPolicy(),
+    inputGeneratePasswordMethod: () => passwordPolicyService.generatePassword(),
     inputLabel: $gettext('Password'),
     inputType: 'password',
     onCancel: () => store.dispatch('hideModal'),
diff --git a/packages/web-pkg/package.json b/packages/web-pkg/package.json
index 3f4acd38bcc..947c58abcae 100644
--- a/packages/web-pkg/package.json
+++ b/packages/web-pkg/package.json
@@ -22,9 +22,11 @@
     "design-system": "workspace:@ownclouders/design-system@*",
     "filesize": "^9.0.11",
     "fuse.js": "^6.5.3",
+    "js-generate-password": "^0.1.9",
     "lodash-es": "^4.17.21",
     "luxon": "^2.4.0",
     "mark.js": "^8.11.1",
+    "password-sheriff": "^1.1.1",
     "pinia": "^2.1.3",
     "qs": "^6.10.3",
     "semver": "^7.3.8",
@@ -34,7 +36,6 @@
     "vue3-gettext": "2.5.0-alpha.1",
     "vuex": "4.1.0",
     "web-client": "workspace:@ownclouders/web-client@*",
-    "web-pkg": "workspace:@ownclouders/web-pkg@*",
-    "password-sheriff": "^1.1.1"
+    "web-pkg": "workspace:@ownclouders/web-pkg@*"
   }
 }
diff --git a/packages/web-pkg/src/services/passwordPolicy/passwordPolicy.ts b/packages/web-pkg/src/services/passwordPolicy/passwordPolicy.ts
index 5f7cd2c1817..6ea84ea4aab 100644
--- a/packages/web-pkg/src/services/passwordPolicy/passwordPolicy.ts
+++ b/packages/web-pkg/src/services/passwordPolicy/passwordPolicy.ts
@@ -9,18 +9,29 @@ import {
   MustNotBeEmptyRule
 } from './rules'
 import { PasswordPolicyCapability } from 'web-client/src/ocs/capabilities'
-import { PasswordPolicy } from 'password-sheriff'
 import get from 'lodash-es/get'
 import { Store } from 'vuex'
+import { PasswordPolicy } from 'password-sheriff'
+import { GeneratePassword } from 'js-generate-password'
+
+interface GeneratePasswordRules {
+  length: number
+  minLowercaseCharacters: number
+  minUppercaseCharacters: number
+  minSpecialCharacters: number
+  minDigits: number
+}
 
 export class PasswordPolicyService {
   private readonly capability: PasswordPolicyCapability
   private readonly language: Language
   private policy: PasswordPolicy
+  private generatePasswordRules: GeneratePasswordRules
 
   constructor({ store, language }: { store: Store<unknown>; language: Language }) {
     this.capability = get(store, 'getters.capabilities.password_policy', {})
     this.language = language
+    this.buildGeneratePasswordRules()
     this.buildPolicy()
   }
 
@@ -32,7 +43,39 @@ export class PasswordPolicyService {
     )
   }
 
-  private buildPolicy() {
+  private buildGeneratePasswordRules(): void {
+    const DEFAULT_LENGTH = 12
+    const DEFAULT_MIN_LOWERCASE_CHARACTERS = 2
+    const DEFAULT_MIN_UPPERCASE_CHARACTERS = 2
+    const DEFAULT_MIN_SPECIAL_CHARACTERS = 2
+    const DEFAULT_MIN_DIGITS = 2
+
+    this.generatePasswordRules = {
+      length: Math.max(
+        this.capability.min_characters || 0,
+        (this.capability.min_lowercase_characters || 0) +
+          (this.capability.min_uppercase_characters || 0) +
+          (this.capability.min_digits || 0) +
+          (this.capability.min_special_characters || 0),
+        DEFAULT_LENGTH
+      ),
+      minLowercaseCharacters: Math.max(
+        this.capability.min_lowercase_characters || 0,
+        DEFAULT_MIN_LOWERCASE_CHARACTERS
+      ),
+      minUppercaseCharacters: Math.max(
+        this.capability.min_uppercase_characters || 0,
+        DEFAULT_MIN_UPPERCASE_CHARACTERS
+      ),
+      minSpecialCharacters: Math.max(
+        this.capability.min_special_characters || 0,
+        DEFAULT_MIN_SPECIAL_CHARACTERS
+      ),
+      minDigits: Math.max(this.capability.min_digits || 0, DEFAULT_MIN_DIGITS)
+    }
+  }
+
+  private buildPolicy(): void {
     const ruleset = {
       atLeastCharacters: new AtLeastCharactersRule({ ...this.language }),
       mustNotBeEmpty: new MustNotBeEmptyRule({ ...this.language }),
@@ -85,4 +128,15 @@ export class PasswordPolicyService {
   public getPolicy(): PasswordPolicy {
     return this.policy
   }
+
+  public generatePassword(): string {
+    return GeneratePassword({
+      symbols: true,
+      length: this.generatePasswordRules.length,
+      minLengthLowercase: this.generatePasswordRules.minLowercaseCharacters,
+      minLengthUppercase: this.generatePasswordRules.minUppercaseCharacters,
+      minLengthNumbers: this.generatePasswordRules.minDigits,
+      minLengthSymbols: this.generatePasswordRules.minSpecialCharacters
+    })
+  }
 }
diff --git a/packages/web-runtime/src/App.vue b/packages/web-runtime/src/App.vue
index 2543ce66e98..9459741b81b 100644
--- a/packages/web-runtime/src/App.vue
+++ b/packages/web-runtime/src/App.vue
@@ -16,6 +16,7 @@
       :input-description="modal.inputDescription"
       :input-placeholder="modal.inputPlaceholder"
       :input-password-policy="modal.inputPasswordPolicy"
+      :input-generate-password-method="modal.inputGeneratePasswordMethod"
       :input-disabled="modal.inputDisabled"
       :input-error="modal.inputError"
       :input-label="modal.inputLabel"
diff --git a/packages/web-runtime/src/store/modal.ts b/packages/web-runtime/src/store/modal.ts
index d1d505278c6..6e6d485a017 100644
--- a/packages/web-runtime/src/store/modal.ts
+++ b/packages/web-runtime/src/store/modal.ts
@@ -72,6 +72,7 @@ const mutations = {
     state.hasInput = modal.hasInput || false
     state.inputValue = modal.inputValue || null
     state.inputPasswordPolicy = modal.inputPasswordPolicy || {}
+    state.inputGeneratePasswordMethod = modal.inputGeneratePasswordMethod || null
     state.inputSelectionRange = modal.inputSelectionRange
     state.inputDescription = modal.inputDescription || null
     state.inputPlaceholder = modal.inputPlaceholder || null
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 847d90b8d55..c518bf471b0 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -934,6 +934,9 @@ importers:
       fuse.js:
         specifier: ^6.5.3
         version: 6.5.3
+      js-generate-password:
+        specifier: ^0.1.9
+        version: 0.1.9
       lodash-es:
         specifier: ^4.17.21
         version: 4.17.21
@@ -14031,6 +14034,11 @@ packages:
       nopt: 6.0.0
     dev: true
 
+  /js-generate-password@0.1.9:
+    resolution: {integrity: sha512-eBHpI+Re+zGZIsKBmBNjJk1bt7jeY8cBJMPhb+AhZaZ/DYjerCKwN6cQDjXUxFCHVHd8u9Fn4zgFBMDFQLoSZg==}
+    hasBin: true
+    dev: false
+
   /js-sdsl@4.1.5:
     resolution: {integrity: sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q==}
     dev: false