diff --git a/changelog/unreleased/enhancemnet-alias-links b/changelog/unreleased/enhancemnet-alias-links
new file mode 100644
index 00000000000..0b2596464d5
--- /dev/null
+++ b/changelog/unreleased/enhancemnet-alias-links
@@ -0,0 +1,6 @@
+Enhancement: Resolve alias links
+
+Alias links can now be resolved successfully.
+
+https://github.com/owncloud/web/pull/7405
+https://github.com/owncloud/web/issues/7304
diff --git a/deployments/examples/ocis_web/config/ocis/proxy.yaml b/deployments/examples/ocis_web/config/ocis/proxy.yaml
index e3244e00160..9e337df9b79 100644
--- a/deployments/examples/ocis_web/config/ocis/proxy.yaml
+++ b/deployments/examples/ocis_web/config/ocis/proxy.yaml
@@ -39,6 +39,10 @@ policies:
         endpoint: /ocs/v[12].php/config
         backend: http://localhost:9140
         unprotected: true
+      - type: regex
+        endpoint: /ocs/v[12].php/apps/files_sharing/api/v1/tokeninfo/unprotected
+        backend: http://localhost:9140
+        unprotected: true
       - endpoint: /ocs/
         backend: http://localhost:9140
       - type: query
diff --git a/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue b/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
index c083106667d..b44fc5301e5 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
@@ -19,7 +19,7 @@
       />
       <details-and-edit
         v-if="quicklink"
-        :available-role-options="availableRoleOptions"
+        :available-role-options="getAvailableRoleOptions(quicklink)"
         :can-rename="false"
         :expiration-date="expirationDate"
         :is-folder-share="highlightedFile.isFolder"
@@ -52,7 +52,7 @@
       >
         <name-and-copy :link="link" />
         <details-and-edit
-          :available-role-options="availableRoleOptions"
+          :available-role-options="getAvailableRoleOptions(link)"
           :can-rename="true"
           :expiration-date="expirationDate"
           :is-folder-share="highlightedFile.isFolder"
@@ -89,7 +89,7 @@
         >
           <name-and-copy :link="link" />
           <details-and-edit
-            :available-role-options="availableRoleOptions"
+            :available-role-options="getAvailableRoleOptions(link)"
             :expiration-date="expirationDate"
             :is-folder-share="true"
             :is-modifiable="false"
@@ -230,23 +230,6 @@ export default defineComponent({
       }
     },
 
-    availableRoleOptions() {
-      if (this.incomingParentShare.value && this.canCreatePublicLinks) {
-        return LinkShareRoles.filterByBitmask(
-          parseInt(this.incomingParentShare.value.permissions),
-          this.highlightedFile.isFolder,
-          this.hasPublicLinkEditing,
-          this.hasPublicLinkAliasSupport
-        )
-      }
-
-      return LinkShareRoles.list(
-        this.highlightedFile.isFolder,
-        this.hasPublicLinkEditing,
-        this.hasPublicLinkAliasSupport
-      )
-    },
-
     passwordEnforced() {
       return (
         this.capabilities.files_sharing.public.password?.enforced_for || {
@@ -382,7 +365,7 @@ export default defineComponent({
 
     isPasswordEnforcedFor(link) {
       const currentRole = LinkShareRoles.getByBitmask(
-        parseInt(link.permissions),
+        link.permissions,
         link.indirect || this.highlightedFile.isFolder
       )
 
@@ -585,6 +568,25 @@ export default defineComponent({
             status: 'danger'
           })
         })
+    },
+
+    getAvailableRoleOptions(link) {
+      if (this.share?.incoming && this.canCreatePublicLinks) {
+        return LinkShareRoles.filterByBitmask(
+          parseInt(this.share.permissions),
+          this.highlightedFile.isFolder,
+          this.hasPublicLinkEditing,
+          true,
+          !!link.password
+        )
+      }
+
+      return LinkShareRoles.list(
+        this.highlightedFile.isFolder,
+        this.hasPublicLinkEditing,
+        true,
+        !!link.password
+      )
     }
   }
 })
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 a67303321ac..eaeb28bf166 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
@@ -27,14 +27,11 @@
             <oc-button
               :id="`files-role-${roleOption.label.toLowerCase()}`"
               :class="{
-                selected: parseInt(link.permissions) === roleOption.bitmask(false),
-                'oc-background-primary-gradient':
-                  parseInt(link.permissions) === roleOption.bitmask(false)
+                selected: link.permissions === roleOption.bitmask(false),
+                'oc-background-primary-gradient': link.permissions === roleOption.bitmask(false)
               }"
               appearance="raw"
-              :variation="
-                parseInt(link.permissions) === roleOption.bitmask(false) ? 'inverse' : 'passive'
-              "
+              :variation="link.permissions === roleOption.bitmask(false) ? 'inverse' : 'passive'"
               justify-content="space-between"
               class="oc-p-s"
               @click="
@@ -58,10 +55,7 @@
                 </span>
               </span>
               <span class="oc-flex">
-                <oc-icon
-                  v-if="parseInt(link.permissions) === roleOption.bitmask(false)"
-                  name="check"
-                />
+                <oc-icon v-if="link.permissions === roleOption.bitmask(false)" name="check" />
               </span>
             </oc-button>
           </li>
@@ -183,7 +177,11 @@ import { basename } from 'path'
 import { DateTime } from 'luxon'
 import { mapActions, mapGetters } from 'vuex'
 import { createLocationSpaces } from '../../../../router'
-import { LinkShareRoles } from 'web-client/src/helpers/share'
+import {
+  linkRoleInternalFile,
+  linkRoleInternalFolder,
+  LinkShareRoles
+} from 'web-client/src/helpers/share'
 import { defineComponent } from '@vue/runtime-core'
 import { formatDateFromDateTime, formatRelativeDateFromDateTime } from 'web-pkg/src/helpers'
 import { Resource } from 'web-client'
@@ -239,15 +237,15 @@ export default defineComponent({
   },
   computed: {
     ...mapGetters('runtime/spaces', ['spaces']),
+    currentLinkRole() {
+      return LinkShareRoles.getByBitmask(this.link.permissions, this.isFolderShare)
+    },
     currentLinkRoleDescription() {
-      return LinkShareRoles.getByBitmask(
-        parseInt(this.link.permissions),
-        this.isFolderShare
-      ).description(false)
+      return this.currentLinkRole.description(false)
     },
 
     currentLinkRoleLabel() {
-      return LinkShareRoles.getByBitmask(parseInt(this.link.permissions), this.isFolderShare).label
+      return this.currentLinkRole.label
     },
 
     editOptions() {
@@ -317,7 +315,7 @@ export default defineComponent({
           })
         }
       }
-      if (!this.isPasswordEnforced && !this.link.password) {
+      if (!this.isPasswordEnforced && !this.link.password && !this.isAliasLink) {
         result.push({
           id: 'add-password',
           title: this.$gettext('Add password'),
@@ -389,6 +387,10 @@ export default defineComponent({
 
     passwortProtectionTooltip() {
       return this.$gettext('This link is password-protected')
+    },
+
+    isAliasLink() {
+      return [linkRoleInternalFolder, linkRoleInternalFile].includes(this.currentLinkRole)
     }
   },
   watch: {
diff --git a/packages/web-app-files/src/components/SideBar/SideBar.vue b/packages/web-app-files/src/components/SideBar/SideBar.vue
index 0c46ed3b06b..0e357f5263e 100644
--- a/packages/web-app-files/src/components/SideBar/SideBar.vue
+++ b/packages/web-app-files/src/components/SideBar/SideBar.vue
@@ -58,6 +58,7 @@ import isEqual from 'lodash-es/isEqual'
 import { useActiveLocation } from '../../composables'
 import { SpaceResource } from 'web-client/src/helpers'
 import { WebDAV } from 'web-client/src/webdav'
+import { ShareTypes } from 'web-client/src/helpers/share'
 
 export default defineComponent({
   components: { FileInfo, SpaceInfo, SideBar },
@@ -113,6 +114,7 @@ export default defineComponent({
     const { webdav } = useClientService()
 
     return {
+      isSpacesGenericLocation: useActiveLocation(isLocationSpacesActive, 'files-spaces-generic'),
       isSpacesProjectsLocation: useActiveLocation(isLocationSpacesActive, 'files-spaces-projects'),
       isSharedWithMeLocation: useActiveLocation(isLocationSharesActive, 'files-shares-with-me'),
       isSharedWithOthersLocation: useActiveLocation(
@@ -200,6 +202,15 @@ export default defineComponent({
       if (this.hasShareJail && this.space?.driveType === 'share') {
         return false
       }
+      if (
+        !pathSegments.length &&
+        this.highlightedFile?.shareTypes?.includes(ShareTypes.link.value) &&
+        this.isSpacesGenericLocation
+      ) {
+        console.log('ALIAS LINK')
+        // alias link for a single resource
+        return false
+      }
       return !pathSegments.length
     },
     highlightedFileThumbnail() {
diff --git a/packages/web-app-files/src/helpers/resources.ts b/packages/web-app-files/src/helpers/resources.ts
index de4cbec2ab7..43dc2a7255b 100644
--- a/packages/web-app-files/src/helpers/resources.ts
+++ b/packages/web-app-files/src/helpers/resources.ts
@@ -45,6 +45,16 @@ export function buildResource(resource): Resource {
   }
 
   const id = resource.fileInfo[DavProperty.FileId]
+  const pathParts = resource.name.split('/')
+  let webDavPath
+  if (pathParts.length === 3 && !isFolder && pathParts[2].includes('!')) {
+    // idComponent includes the opaqueID which represents the resource name.
+    // For the webdav path, we need to replace the opaqueID with the actual resource name.
+    const withoutOpaqueId = resource.name.split('!')[0]
+    webDavPath = `${withoutOpaqueId}/${name}`
+  } else {
+    webDavPath = resource.name
+  }
 
   return {
     id,
@@ -54,7 +64,7 @@ export function buildResource(resource): Resource {
     name,
     extension: isFolder ? '' : extension,
     path: resourcePath,
-    webDavPath: resource.name,
+    webDavPath,
     type: isFolder ? 'folder' : resource.type,
     isFolder,
     mdate: resource.fileInfo[DavProperty.LastModifiedDate],
@@ -357,8 +367,9 @@ export function buildSpaceShare(s, storageId): Share {
 
 function _buildLink(link): Share {
   let description = ''
+  const permissions = parseInt(link.permissions)
 
-  const role = LinkShareRoles.getByBitmask(parseInt(link.permissions), link.item_type === 'folder')
+  const role = LinkShareRoles.getByBitmask(permissions, link.item_type === 'folder')
   if (role) {
     description = role.label
   }
@@ -382,7 +393,7 @@ function _buildLink(link): Share {
     token: link.token as string,
     url: link.url,
     path: link.path,
-    permissions: link.permissions,
+    permissions,
     description,
     quicklink,
     stime: link.stime,
diff --git a/packages/web-app-files/src/services/folder/legacy/loaderPersonal.ts b/packages/web-app-files/src/services/folder/legacy/loaderPersonal.ts
index 6c175968a5e..8e8d84e2979 100644
--- a/packages/web-app-files/src/services/folder/legacy/loaderPersonal.ts
+++ b/packages/web-app-files/src/services/folder/legacy/loaderPersonal.ts
@@ -28,14 +28,17 @@ export class FolderLoaderLegacyPersonal implements FolderLoader {
 
         const resources = yield webdav.listFiles(space, { path })
 
-        const currentFolder = resources.shift()
-        yield store.dispatch('Files/loadSharesTree', {
-          client,
-          path: currentFolder.path
-        })
-
-        for (const file of resources) {
-          file.indicators = getIndicators(file, store.state.Files.sharesTree, false)
+        const currentFolder =
+          resources.length > 1 || resources[0].isFolder ? resources.shift() : undefined
+        if (currentFolder) {
+          yield store.dispatch('Files/loadSharesTree', {
+            client,
+            path: currentFolder.path
+          })
+
+          for (const file of resources) {
+            file.indicators = getIndicators(file, store.state.Files.sharesTree, false)
+          }
         }
 
         store.commit('Files/LOAD_FILES', {
diff --git a/packages/web-client/src/helpers/share/role.ts b/packages/web-client/src/helpers/share/role.ts
index eacb954f069..2309dd81e58 100644
--- a/packages/web-client/src/helpers/share/role.ts
+++ b/packages/web-client/src/helpers/share/role.ts
@@ -364,9 +364,14 @@ export abstract class LinkShareRoles {
     linkRoleUploaderFolder
   ]
 
-  static list(isFolder: boolean, canEditFile = false, hasAliasLinks = false): ShareRole[] {
+  static list(
+    isFolder: boolean,
+    canEditFile = false,
+    hasAliasLinks = false,
+    hasPassword = false
+  ): ShareRole[] {
     return [
-      ...(hasAliasLinks ? [linkRoleInternalFile, linkRoleInternalFolder] : []),
+      ...(hasAliasLinks && !hasPassword ? [linkRoleInternalFile, linkRoleInternalFolder] : []),
       ...this.all,
       ...(canEditFile ? [linkRoleEditorFile] : [])
     ].filter((r) => r.folder === isFolder)
@@ -383,15 +388,17 @@ export abstract class LinkShareRoles {
    * @param isFolder
    * @param canEditFile
    * @param hasAliasLinks
+   * @param hasPassword
    */
   static filterByBitmask(
     bitmask: number,
     isFolder: boolean,
     canEditFile = false,
-    hasAliasLinks = false
+    hasAliasLinks = false,
+    hasPassword = false
   ): ShareRole[] {
     return [
-      ...(hasAliasLinks ? [linkRoleInternalFile, linkRoleInternalFolder] : []),
+      ...(hasAliasLinks && !hasPassword ? [linkRoleInternalFile, linkRoleInternalFolder] : []),
       ...this.all,
       ...(canEditFile ? [linkRoleEditorFile] : [])
     ].filter((r) => {
diff --git a/packages/web-client/src/types.ts b/packages/web-client/src/types.ts
index 30e9cc70604..0582b51ab00 100644
--- a/packages/web-client/src/types.ts
+++ b/packages/web-client/src/types.ts
@@ -33,6 +33,8 @@ export type OwnCloudSdk = {
   shares: {
     getShare(...args): any
     getShares(...args): any
+    getProtectedTokenInfo(...args): any
+    getUnprotectedTokenInfo(...args): any
   }
   users: {
     getUser(...args): any
diff --git a/packages/web-pkg/src/composables/capability/useCapability.ts b/packages/web-pkg/src/composables/capability/useCapability.ts
index 2b6407936ed..42a1f00c63e 100644
--- a/packages/web-pkg/src/composables/capability/useCapability.ts
+++ b/packages/web-pkg/src/composables/capability/useCapability.ts
@@ -28,12 +28,6 @@ export const useCapabilityCoreSupportUrlSigning = createCapabilityComposable(
   'core.support-url-signing',
   false
 )
-
-export const useCapabilityFilesSharingResharing = createCapabilityComposable(
-  'files_sharing.resharing',
-  true
-)
-
 export const useCapabilitySpacesEnabled = createCapabilityComposable('spaces.enabled', false)
 export const useCapabilityProjectSpacesEnabled = createCapabilityComposable(
   'spaces.projects',
@@ -52,6 +46,10 @@ export const useCapabilityFilesTusExtension = createCapabilityComposable<string>
   'files.tus_support.extension',
   ''
 )
+export const useCapabilityFilesSharingResharing = createCapabilityComposable(
+  'files_sharing.resharing',
+  true
+)
 export const useCapabilityFilesSharingPublicCanEdit = createCapabilityComposable(
   'files_sharing.public.can_edit',
   false
diff --git a/packages/web-runtime/package.json b/packages/web-runtime/package.json
index 414dab9f5ae..73e9513eca1 100644
--- a/packages/web-runtime/package.json
+++ b/packages/web-runtime/package.json
@@ -25,7 +25,7 @@
     "marked": "^4.0.12",
     "oidc-client-ts": "^2.0.5",
     "owncloud-design-system": "14.0.0-alpha.18",
-    "owncloud-sdk": "~3.0.0-alpha.15",
+    "owncloud-sdk": "~3.0.0-alpha.17",
     "p-queue": "^6.6.2",
     "popper-max-size-modifier": "^0.2.0",
     "portal-vue": "^2.1.7",
diff --git a/packages/web-runtime/src/composables/tokenInfo/index.ts b/packages/web-runtime/src/composables/tokenInfo/index.ts
new file mode 100644
index 00000000000..e04af314e61
--- /dev/null
+++ b/packages/web-runtime/src/composables/tokenInfo/index.ts
@@ -0,0 +1 @@
+export * from './useLoadTokenInfo'
diff --git a/packages/web-runtime/src/composables/tokenInfo/useLoadTokenInfo.ts b/packages/web-runtime/src/composables/tokenInfo/useLoadTokenInfo.ts
new file mode 100644
index 00000000000..975d614af0a
--- /dev/null
+++ b/packages/web-runtime/src/composables/tokenInfo/useLoadTokenInfo.ts
@@ -0,0 +1,22 @@
+import { unref } from '@vue/composition-api'
+import { useTask } from 'vue-concurrency'
+import { useClientService, useStore, useUserContext } from 'web-pkg/src/composables'
+
+export function useLoadTokenInfo(token) {
+  const { owncloudSdk } = useClientService()
+  const store = useStore()
+  const isUserContext = useUserContext({ store })
+
+  const loadTokenInfoTask = useTask(function* () {
+    try {
+      if (unref(isUserContext)) {
+        return yield owncloudSdk.shares.getProtectedTokenInfo(token)
+      } else {
+        return yield owncloudSdk.shares.getUnprotectedTokenInfo(token)
+      }
+    } catch (e) {} // backend doesn't support the token info endpoint
+    return {}
+  })
+
+  return { loadTokenInfoTask }
+}
diff --git a/packages/web-runtime/src/pages/resolveAliasLink.vue b/packages/web-runtime/src/pages/resolveAliasLink.vue
new file mode 100644
index 00000000000..9fc874732cf
--- /dev/null
+++ b/packages/web-runtime/src/pages/resolveAliasLink.vue
@@ -0,0 +1,79 @@
+<template>
+  <div></div>
+</template>
+
+<script type="ts">
+import {
+  useRoute,
+  useRouteParam,
+  useStore,
+  useTranslations,
+  useUserContext,
+  useRouter
+} from "web-pkg/src/composables";
+import { unref, ref, defineComponent, computed, onMounted } from "@vue/composition-api";
+import { authService } from "../services/auth";
+import { useLoadTokenInfo } from "../composables/tokenInfo";
+import { clientService } from "web-pkg/src/services";
+import { createLocationSpaces } from "files/src/router";
+import {urlJoin} from "web-pkg/src/utils";
+
+export default defineComponent({
+  name: 'ResolveAliasLink',
+  setup() {
+    const store = useStore()
+    const router = useRouter()
+    const route = useRoute()
+    const token = useRouteParam('token')
+    const { $gettext } = useTranslations()
+    const isUserContext = useUserContext({ store })
+    const { loadTokenInfoTask } = useLoadTokenInfo(unref(token))
+    const tokenInfo = ref(undefined)
+
+    onMounted(async () => {
+      if (!unref(isUserContext)) {
+        await authService.loginUser()
+        return router.push({ name: '/login' })
+      }
+
+      tokenInfo.value = await loadTokenInfoTask.perform()
+      resolveAliasLink()
+    })
+
+    const pageTitle = computed(() => $gettext(route.meta.title))
+
+    const resolveAliasLink = async () => {
+      const { id, storage_id: storageId, space_id: spaceId } = unref(tokenInfo)
+      const path = await clientService.owncloudSdk.files.getPathForFileId(id)
+      const matchingSpace = getMatchingSpace(`${storageId}$${spaceId}`)
+      const resource = await clientService.webdav.getFileInfo(matchingSpace, { path })
+
+      let driveAliasPath
+      let scrollTo
+      if (resource.type !== 'file') {
+        driveAliasPath = path
+        scrollTo = ''
+      }  else {
+        driveAliasPath = ''
+        scrollTo = path
+      }
+
+      const location = createLocationSpaces('files-spaces-generic', {
+        params: {
+          driveAliasAndItem: matchingSpace.getDriveAliasAndItem({ path: driveAliasPath })
+        },
+        query: { scrollTo: urlJoin(scrollTo, { leadingSlash: false }) }
+      })
+      return router.push(location)
+    }
+
+    const getMatchingSpace = (spaceId) => {
+      return store.getters['runtime/spaces/spaces'].find((space) => space.id === spaceId)
+    }
+
+    return {
+      pageTitle,
+    }
+  }
+})
+</script>
diff --git a/packages/web-runtime/src/pages/resolvePublicLink.vue b/packages/web-runtime/src/pages/resolvePublicLink.vue
index 97ecea97472..2b41a04c1dc 100644
--- a/packages/web-runtime/src/pages/resolvePublicLink.vue
+++ b/packages/web-runtime/src/pages/resolvePublicLink.vue
@@ -2,7 +2,14 @@
   <div class="oc-height-1-1 oc-link-resolve">
     <h1 class="oc-invisible-sr">{{ pageTitle }}</h1>
     <div class="oc-card oc-border oc-rounded oc-position-center oc-text-center oc-width-large">
-      <template v-if="isPasswordRequiredTask.isRunning || !isPasswordRequiredTask.last">
+      <template
+        v-if="
+          loadTokenInfoTask.isRunning ||
+          !loadTokenInfoTask.last ||
+          isPasswordRequiredTask.isRunning ||
+          !isPasswordRequiredTask.last
+        "
+      >
         <div class="oc-card-header">
           <h2 key="public-link-loading">
             <translate>Loading public link…</translate>
@@ -12,17 +19,22 @@
           <oc-spinner :aria-hidden="true" />
         </div>
       </template>
-      <template v-else-if="isPasswordRequiredTask.isError">
+      <template v-else-if="loadTokenInfoTask.isError || isPasswordRequiredTask.isError">
         <div class="oc-card-header oc-link-resolve-error-title">
           <h2 key="public-link-error">
             <translate>An error occurred while loading the public link</translate>
           </h2>
         </div>
         <div class="oc-card-body oc-link-resolve-error-message">
-          <p class="oc-text-xlarge">{{ isPasswordRequiredTask.last.error }}</p>
+          <p v-if="loadTokenInfoTask.isError" class="oc-text-xlarge">
+            {{ loadTokenInfoTask.last.error }}
+          </p>
+          <p v-if="isPasswordRequiredTask.isError" class="oc-text-xlarge">
+            {{ isPasswordRequiredTask.last.error }}
+          </p>
         </div>
       </template>
-      <template v-else-if="isPasswordRequiredTask.last.value">
+      <template v-else-if="isPasswordRequiredTask.last && isPasswordRequiredTask.last.value">
         <form @submit.prevent="resolvePublicLink(true)">
           <div class="oc-card-header">
             <h2>
@@ -69,11 +81,14 @@ import {
   useClientService,
   useRouteParam,
   useRouteQuery
-} from 'web-pkg/src/composables'
+} from "web-pkg/src/composables";
 import { useTask } from 'vue-concurrency'
 import { ref, unref, computed, defineComponent } from "@vue/composition-api";
 import { buildPublicSpaceResource, isPublicSpaceResource } from "web-client/src/helpers";
 import { buildWebDavPublicPath } from "files/src/helpers/resources";
+import isEmpty from "lodash-es/isEmpty";
+import { useLoadTokenInfo } from '../composables/tokenInfo'
+
 
 export default defineComponent({
   name: 'ResolvePublicLink',
@@ -88,7 +103,10 @@ export default defineComponent({
       webDavPath: buildWebDavPublicPath(unref(token), ''),
       ...(unref(password) && { publicLinkPassword: unref(password) })
     }))
-    const isPasswordRequiredTask = useTask(function* () {
+    const isPasswordRequiredTask = useTask(function* (signal, ref) {
+      if (!isEmpty(ref.tokenInfo)) {
+        return ref.tokenInfo.password_protected === 'true'
+      }
       try {
         yield webdav.getFileInfo({ ...unref(publicLinkSpace), publicLinkPassword: null })
         return false
@@ -115,6 +133,7 @@ export default defineComponent({
       return false
     })
     return {
+      ...useLoadTokenInfo(unref(token)),
       redirectUrl: useRouteQuery('redirectUrl'),
       token,
       password,
@@ -123,6 +142,11 @@ export default defineComponent({
       wrongPassword
     }
   },
+  data() {
+    return {
+      tokenInfo: {}
+    }
+  },
   computed: {
     ...mapGetters(['configuration']),
 
@@ -142,13 +166,18 @@ export default defineComponent({
     }
   },
   async mounted() {
-    const passwordRequired = await this.isPasswordRequiredTask.perform()
-    if (!passwordRequired) {
+    this.tokenInfo = await this.loadTokenInfoTask.perform()
+    const passwordProtected = await this.isPasswordRequiredTask.perform(this)
+    if (!passwordProtected) {
       await this.resolvePublicLink(false)
     }
   },
   methods: {
     async resolvePublicLink(passwordRequired) {
+      if (this.tokenInfo?.alias_link) {
+        return this.$router.push({ name: `resolveAliasLink`, params: { token: this.token }})
+      }
+
       const publicLink = await this.loadPublicLinkTask.perform()
       if (this.loadPublicLinkTask.isError) {
         const e = this.loadPublicLinkTask.last.error
diff --git a/packages/web-runtime/src/router/index.ts b/packages/web-runtime/src/router/index.ts
index 67ebc116a46..89d29b7ce07 100644
--- a/packages/web-runtime/src/router/index.ts
+++ b/packages/web-runtime/src/router/index.ts
@@ -6,6 +6,7 @@ import LoginPage from '../pages/login.vue'
 import LogoutPage from '../pages/logout.vue'
 import OidcCallbackPage from '../pages/oidcCallback.vue'
 import ResolvePublicLinkPage from '../pages/resolvePublicLink.vue'
+import ResolveAliasLinkPage from '../pages/resolveAliasLink.vue'
 import { setupAuthGuard } from './setupAuthGuard'
 import { patchRouter } from './patchCleanPath'
 
@@ -71,6 +72,12 @@ export const router = patchRouter(
         component: ResolvePublicLinkPage,
         meta: { title: $gettext('Public link') }
       },
+      {
+        path: '/alias/:token',
+        name: 'resolveAliasLink',
+        component: ResolveAliasLinkPage,
+        meta: { title: $gettext('Private link') }
+      },
       {
         path: '/access-denied',
         name: 'accessDenied',
diff --git a/yarn.lock b/yarn.lock
index c8e01c7acc9..50b80b29fab 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9803,9 +9803,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"owncloud-sdk@npm:~3.0.0-alpha.15":
-  version: 3.0.0-alpha.15
-  resolution: "owncloud-sdk@npm:3.0.0-alpha.15"
+"owncloud-sdk@npm:~3.0.0-alpha.17":
+  version: 3.0.0-alpha.17
+  resolution: "owncloud-sdk@npm:3.0.0-alpha.17"
   peerDependencies:
     axios: ^0.27.2
     cross-fetch: ^3.0.6
@@ -9818,7 +9818,7 @@ __metadata:
   dependenciesMeta:
     "@pact-foundation/pact":
       built: true
-  checksum: 3892508b42965f5602fb985173185ee9799d41d0e719895ad574d4b8b2b15326d69bc14300c1d84b14422e4acb3f4de101fdce2f36fc52658c0fa8b17b76c614
+  checksum: 587157336c6af1c20f1ce1255b924334372a5d4a28918b93857200ecf4f99d31f2619a9a19687ff3eec4a3de830aa7e9aa754ac5a1ba844841afb8be90afed24
   languageName: node
   linkType: hard
 
@@ -13866,7 +13866,7 @@ __metadata:
     marked: ^4.0.12
     oidc-client-ts: ^2.0.5
     owncloud-design-system: 14.0.0-alpha.18
-    owncloud-sdk: ~3.0.0-alpha.15
+    owncloud-sdk: ~3.0.0-alpha.17
     p-queue: ^6.6.2
     popper-max-size-modifier: ^0.2.0
     portal-vue: ^2.1.7