diff --git a/frontend/src/components/RecoveryKeyDialog.vue b/frontend/src/components/DisplayRecoveryKeyDialog.vue
similarity index 100%
rename from frontend/src/components/RecoveryKeyDialog.vue
rename to frontend/src/components/DisplayRecoveryKeyDialog.vue
diff --git a/frontend/src/components/VaultDetails.vue b/frontend/src/components/VaultDetails.vue
index 84183aacd..5019dba1d 100644
--- a/frontend/src/components/VaultDetails.vue
+++ b/frontend/src/components/VaultDetails.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="vault == null || vaultRecoveryRequired == null">
+  <div v-if="vault == null">
     <div v-if="onFetchError == null">
       {{ t('common.loading') }}
     </div>
@@ -36,7 +36,7 @@
       </dl>
     </div>
 
-    <div v-if="role == 'OWNER' && !vaultRecoveryRequired" class="space-y-6">
+    <div v-if="vaultRole == 'OWNER' && !vaultRecoveryRequired" class="space-y-6">
       <div>
         <h3 class="font-medium text-gray-900">{{ t('vaultDetails.sharedWith.title') }}</h3>
         <ul role="list" class="mt-2 border-t border-b border-gray-200 divide-y divide-gray-200">
@@ -49,7 +49,7 @@
                   <p class="w-full ml-4 text-sm font-medium text-gray-900 truncate">{{ member.name }}</p>
                   <div v-if="member.role == 'OWNER'" class="ml-3 inline-flex items-center rounded-md bg-gray-50 px-2 py-1 text-xs font-medium text-gray-600 ring-1 ring-inset ring-gray-500/10">{{ t('vaultDetails.sharedWith.badge.owner') }}</div>
                 </div>
-                <Menu v-if="member.id != me?.id && !vault.archived" as="div" class="relative ml-2 inline-block flex-shrink-0 text-left">
+                <Menu v-if="member.id != me?.id" as="div" class="relative ml-2 inline-block flex-shrink-0 text-left">
                   <MenuButton class="group relative inline-flex h-8 w-8 items-center justify-center rounded-full bg-white focus:outline-none focus:ring-2 focus:ring-primary focus:ring-offset-2">
                     <span class="absolute -inset-1.5" />
                     <span class="sr-only">Open options menu</span>
@@ -60,12 +60,12 @@
                   <transition enter-active-class="transition ease-out duration-100" enter-from-class="transform opacity-0 scale-95" enter-to-class="transform opacity-100 scale-100" leave-active-class="transition ease-in duration-75" leave-from-class="transform opacity-100 scale-100" leave-to-class="transform opacity-0 scale-95">
                     <MenuItems class="absolute right-9 top-0 z-10 w-48 origin-top-right rounded-md bg-white shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none">
                       <div class="py-1">
-                        <MenuItem v-if="member.role == 'MEMBER' && !paymentRequired" v-slot="{ active }" @click="updateMemberRole(member, 'OWNER')">
+                        <MenuItem v-if="member.role == 'MEMBER'" v-slot="{ active }" @click="updateMemberRole(member, 'OWNER')">
                           <div :class="[active ? 'bg-gray-100 text-gray-900' : 'text-gray-700', 'cursor-pointer block px-4 py-2 text-sm']">
                             {{ t('vaultDetails.sharedWith.grantOwnership') }}
                           </div>
                         </MenuItem>
-                        <MenuItem v-if="member.role == 'OWNER' && !paymentRequired" v-slot="{ active }" @click="updateMemberRole(member, 'MEMBER')">
+                        <MenuItem v-if="member.role == 'OWNER'" v-slot="{ active }" @click="updateMemberRole(member, 'MEMBER')">
                           <div :class="[active ? 'bg-gray-100 text-gray-900' : 'text-gray-700', 'cursor-pointer block px-4 py-2 text-sm']">
                             {{ t('vaultDetails.sharedWith.revokeOwnership') }}
                           </div>
@@ -87,7 +87,7 @@
             </li>
           </template>
           <!-- add member -->
-          <li v-if="!vault.archived && !paymentRequired" class="py-2 flex flex-col">
+          <li v-if="!vault.archived && !licenseViolated" class="py-2 flex flex-col">
             <div v-if="!addingUser" class="justify-between items-center">
               <button type="button" class="group -ml-1 bg-white p-1 rounded-md flex items-center focus:outline-none focus:ring-2 focus:ring-primary" @click="addingUser = true">
                 <span class="w-8 h-8 rounded-full border-2 border-dashed border-gray-300 flex items-center justify-center text-gray-400">
@@ -99,7 +99,7 @@
             <SearchInputGroup v-else-if="addingUser" :action-title="t('common.add')" :on-search="searchAuthority" @action="addAuthority" />
             <div v-if="onAddUserError != null">
               <p v-if="onAddUserError instanceof PaymentRequiredError" class="text-sm text-red-900 text-right mt-1">
-                {{ t('vaultDetails.error.paymentRequired') }}
+                {{ t('vaultDetails.error.licenseViolated') }}
               </p>
               <p v-else class="text-sm text-red-900 text-right mt-1">
                 {{ t('common.unexpectedError', [onAddUserError.message]) }}
@@ -108,90 +108,112 @@
           </li>
         </ul>
       </div>
+    </div>
 
-      <!-- button bar -->
-      <div>
-        <h3 class="font-medium text-gray-900">{{ t('vaultDetails.actions.title') }}</h3>
-
-        <p v-if="paymentRequired" class="text-sm text-red-900 mt-1">
-          {{ t('vaultDetails.error.paymentRequired') }}
-        </p>
-
-        <div v-else-if="!vault.archived" class="mt-2 flex flex-col gap-2">
-          <div class="flex gap-2">
-            <button :disabled="usersRequiringAccessGrant.length == 0" type="button" class="flex-1 bg-primary py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white hover:bg-primary-d1 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary disabled:opacity-50 disabled:hover:bg-primary disabled:cursor-not-allowed" @click="showGrantPermissionDialog()">
-              {{ t('vaultDetails.actions.updatePermissions') }}
-            </button>
-            <button type="button" class="bg-white py-2 px-4 border border-gray-300 rounded-md shadow-sm text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary" @click="reloadDevicesRequiringAccessGrant()">
-              <span class="sr-only">{{ t('vaultDetails.actions.updatePermissions.reload') }}</span>
-              <ArrowPathIcon class="h-5 w-5" aria-hidden="true" />
-            </button>
-          </div>
-          <button type="button" class="bg-white py-2 px-4 border border-gray-300 rounded-md shadow-sm text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary" @click="showEditVaultMetadataDialog()">
-            {{ t('vaultDetails.actions.editVaultMetadata') }}
-          </button>
-          <button type="button" class="bg-white py-2 px-4 border border-gray-300 rounded-md shadow-sm text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary" @click="showDownloadVaultTemplateDialog()">
-            {{ t('vaultDetails.actions.downloadVaultTemplate') }}
-          </button>
-          <button type="button" class="bg-white py-2 px-4 border border-gray-300 rounded-md shadow-sm text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary" @click="showRecoveryKeyDialog()">
-            {{ t('vaultDetails.actions.showRecoveryKey') }}
-          </button>
-          <button type="button" class="bg-red-600 py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white  hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500" @click="showArchiveVaultDialog()">
-            {{ t('vaultDetails.actions.archiveVault') }}
-          </button>
-        </div>
+    <!-- button bar -->
+    <div>
+      <h3 class="font-medium text-gray-900">{{ t('vaultDetails.actions.title') }}</h3>
 
-        <div v-else class="mt-2 flex flex-col gap-2">
-          <button type="button" class="bg-white py-2 px-4 border border-gray-300 rounded-md shadow-sm text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary" @click="showRecoveryKeyDialog()">
-            {{ t('vaultDetails.actions.showRecoveryKey') }}
-          </button>
-          <button type="button" class="bg-red-600 py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white  hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500" @click="showReactivateVaultDialog()">
-            {{ t('vaultDetails.actions.reactivateVault') }}
-          </button>
-        </div>
+      <!-- required legacy migration stuff, otherwise there is no owner -->
+      <div v-if="isLegacyVault" class="mt-2 flex flex-col gap-2">
+        <button type="button" class="bg-primary py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white hover:bg-primary-d1 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary" @click="showClaimOwnershipDialog()">
+          {{ t('vaultDetails.actions.claimOwnership') }}
+        </button>
       </div>
-    </div>
 
-    <div v-else-if="vault.authPublicKey !== null">
-      <!-- if role !== 'OWNER' -->
-      <button type="button" class="bg-primary py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white hover:bg-primary-d1 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary" @click="showClaimOwnershipDialog()">
-        {{ t('vaultDetails.claimOwnership') }}
-      </button>
-    </div>
+      <!-- license violated -->
+      <div v-else-if="licenseViolated" class="mt-2 flex flex-col gap-2">
+        <!-- editMetadata button -->
+        <button v-if="vaultRole == 'OWNER'" type="button" class="bg-white py-2 px-4 border border-gray-300 rounded-md shadow-sm text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary" @click="showEditVaultMetadataDialog()">
+          {{ t('vaultDetails.actions.editVaultMetadata') }}
+        </button>
+        <!-- archiveVault button -->
+        <button v-if="(vaultRole == 'OWNER' || isAdmin)" type="button" class="bg-red-600 py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white  hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500" @click="showArchiveVaultDialog()">
+          {{ t('vaultDetails.actions.archiveVault') }}
+        </button>
+      </div>
 
-    <div v-else-if="!vault.archived && vaultRecoveryRequired" class="mt-2 flex flex-col gap-2">
-      <div class="flex">
-        <div class="flex-shrink-0">
-          <ExclamationTriangleIcon class="mt-1 h-5 w-5 text-yellow-400" aria-hidden="true" />
+      <!-- special owner reset stuff -->
+      <div v-else-if="vaultRecoveryRequired" class="mt-2 flex flex-col gap-2">
+        <div class="flex">
+          <div class="flex-shrink-0">
+            <ExclamationTriangleIcon class="mt-1 h-5 w-5 text-yellow-400" aria-hidden="true" />
+          </div>
+          <h3 class="ml-3 font-medium text-gray-900">{{ t('vaultDetails.recoverVault.title') }}</h3>
         </div>
-        <h3 class="ml-3 font-medium text-gray-900">{{ t('vaultDetails.recoverVault.title') }}</h3>
+        <p class="text-sm text-gray-500">{{ t('vaultDetails.recoverVault.description') }}</p>
+        <button type="button" class="bg-red-600 py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white  hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500" @click="showRecoverVaultDialog()">
+          {{ t('vaultDetails.actions.recoverVault') }}
+        </button>
+      </div>
+
+      <!-- vault is archived -->
+      <div v-else-if="vault.archived" class="mt-2 flex flex-col gap-2">
+        <!-- downloadTemplate button -->
+        <button v-if="vaultRole == 'OWNER'" type="button" class="bg-white py-2 px-4 border border-gray-300 rounded-md shadow-sm text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary" @click="showDownloadVaultTemplateDialog()">
+          {{ t('vaultDetails.actions.downloadVaultTemplate') }}
+        </button>
+        <!-- displayRecoveryKey button -->
+        <button v-if="vaultRole == 'OWNER'" type="button" class="bg-white py-2 px-4 border border-gray-300 rounded-md shadow-sm text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary" @click="showDisplayRecoveryKeyDialog()">
+          {{ t('vaultDetails.actions.displayRecoveryKey') }}
+        </button>
+        <!-- reactivateVault button -->
+        <button v-if="(vaultRole == 'OWNER' || isAdmin)" type="button" class="bg-red-600 py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white  hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500" @click="showReactivateVaultDialog()">
+          {{ t('vaultDetails.actions.reactivateVault') }}
+        </button>
       </div>
-      <p class="text-sm text-gray-500">{{ t('vaultDetails.recoverVault.description') }}</p>
 
-      <button type="button" class="bg-red-600 py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white  hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500" @click="showRecoverVaultDialog()">
-        {{ t('vaultDetails.recoverVault') }}
-      </button>
+      <!-- regular vault -->
+      <div v-else class="mt-2 flex flex-col gap-2">
+        <!-- grantAccess button -->
+        <div v-if="vaultRole == 'OWNER'" class="flex gap-2">
+          <button :disabled="usersRequiringAccessGrant.length == 0" type="button" class="flex-1 bg-primary py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white hover:bg-primary-d1 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary disabled:opacity-50 disabled:hover:bg-primary disabled:cursor-not-allowed" @click="showGrantPermissionDialog()">
+            {{ t('vaultDetails.actions.updatePermissions') }}
+          </button>
+          <button type="button" class="bg-white py-2 px-4 border border-gray-300 rounded-md shadow-sm text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary" @click="reloadDevicesRequiringAccessGrant()">
+            <span class="sr-only">{{ t('vaultDetails.actions.updatePermissions.reload') }}</span>
+            <ArrowPathIcon class="h-5 w-5" aria-hidden="true" />
+          </button>
+        </div>
+        <!-- editMetadata button -->
+        <button v-if="vaultRole == 'OWNER'" type="button" class="bg-white py-2 px-4 border border-gray-300 rounded-md shadow-sm text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary" @click="showEditVaultMetadataDialog()">
+          {{ t('vaultDetails.actions.editVaultMetadata') }}
+        </button>
+        <!-- downloadTemplate button -->
+        <button v-if="vaultRole == 'OWNER'" type="button" class="bg-white py-2 px-4 border border-gray-300 rounded-md shadow-sm text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary" @click="showDownloadVaultTemplateDialog()">
+          {{ t('vaultDetails.actions.downloadVaultTemplate') }}
+        </button>
+        <!-- displayRecoveryKey button -->
+        <button v-if="vaultRole == 'OWNER'" type="button" class="bg-white py-2 px-4 border border-gray-300 rounded-md shadow-sm text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary" @click="showDisplayRecoveryKeyDialog()">
+          {{ t('vaultDetails.actions.displayRecoveryKey') }}
+        </button>
+        <!-- archiveVault button -->
+        <button v-if="(vaultRole == 'OWNER' || isAdmin)" type="button" class="bg-red-600 py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white  hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500" @click="showArchiveVaultDialog()">
+          {{ t('vaultDetails.actions.archiveVault') }}
+        </button>
+      </div>
     </div>
   </div>
 
-  <ClaimVaultOwnershipDialog v-if="claimingVaultOwnership && vault != null" ref="claimVaultOwnershipDialog" :vault="vault" @action="provedOwnership" @close="claimingVaultOwnership = false" />
-  <GrantPermissionDialog v-if="grantingPermission && vault != null && vaultKeys != null && !vaultRecoveryRequired" ref="grantPermissionDialog" :vault="vault" :users="usersRequiringAccessGrant" :vault-keys="vaultKeys" @close="grantingPermission = false" @permission-granted="permissionGranted()" />
-  <EditVaultMetadataDialog v-if="editingVaultMetadata && vault != null && vaultKeys != null && !vaultRecoveryRequired" ref="editVaultMetadataDialog" :vault="vault" @close="editingVaultMetadata = false" @updated="v => refreshVault(v)" />
-  <DownloadVaultTemplateDialog v-if="downloadingVaultTemplate && vault != null && vaultKeys != null && !vaultRecoveryRequired" ref="downloadVaultTemplateDialog" :vault="vault" :vault-keys="vaultKeys" @close="downloadingVaultTemplate = false" />
-  <RecoveryKeyDialog v-if="showingRecoveryKey && vault != null && vaultKeys != null && !vaultRecoveryRequired" ref="recoveryKeyDialog" :vault="vault" :vault-keys="vaultKeys" @close="showingRecoveryKey = false" />
-  <ArchiveVaultDialog v-if="archivingVault && vault != null && !vaultRecoveryRequired" ref="archiveVaultDialog" :vault="vault" @close="archivingVault = false" @archived="v => refreshVault(v)" />
-  <ReactivateVaultDialog v-if="reactivatingVault && vault != null" ref="reactivateVaultDialog" :vault="vault" @close="reactivatingVault = false" @reactivated="v => refreshVault(v)" />
-  <RecoverVaultDialog v-if="vaultRecoveryRequired && vault != null" ref="recoverVaultDialog" :vault="vault" :me="me!" @close="recoverVault = false" @recovered="reloadView()" />
+  <ClaimVaultOwnershipDialog v-if="claimingVaultOwnership && vault" ref="claimVaultOwnershipDialog" :vault="vault" @action="provedOwnership" @close="claimingVaultOwnership = false" />
+  <GrantPermissionDialog v-if="grantingPermission && vault && vaultKeys" ref="grantPermissionDialog" :vault="vault" :users="usersRequiringAccessGrant" :vault-keys="vaultKeys" @close="grantingPermission = false" @permission-granted="permissionGranted()" />
+  <EditVaultMetadataDialog v-if="editingVaultMetadata && vault" ref="editVaultMetadataDialog" :vault="vault" @close="editingVaultMetadata = false" @updated="v => refreshVault(v)" />
+  <DownloadVaultTemplateDialog v-if="downloadingVaultTemplate && vault && vaultKeys" ref="downloadVaultTemplateDialog" :vault="vault" :vault-keys="vaultKeys" @close="downloadingVaultTemplate = false" />
+  <DisplayRecoveryKeyDialog v-if="displayingRecoveryKey && vault && vaultKeys" ref="displayRecoveryKeyDialog" :vault="vault" :vault-keys="vaultKeys" @close="displayingRecoveryKey = false" />
+  <ArchiveVaultDialog v-if="archivingVault && vault" ref="archiveVaultDialog" :vault="vault" @close="archivingVault = false" @archived="v => refreshVault(v)" />
+  <ReactivateVaultDialog v-if="reactivatingVault && vault" ref="reactivateVaultDialog" :vault="vault" @close="reactivatingVault = false" @reactivated="v => { refreshVault(v); refreshLicense();}" />
+  <RecoverVaultDialog v-if="recoveringVault && vault && me" ref="recoverVaultDialog" :vault="vault" :me="me" @close="recoveringVault = false" @recovered="fetchOwnerData()" />
 </template>
 
 <script setup lang="ts">
+import auth from '../common/auth';
 import { Menu, MenuButton, MenuItem, MenuItems } from '@headlessui/vue';
 import { ArrowPathIcon, EllipsisVerticalIcon, ExclamationTriangleIcon } from '@heroicons/vue/20/solid';
 import { PlusSmallIcon } from '@heroicons/vue/24/solid';
 import { base64 } from 'rfc4648';
 import { computed, nextTick, onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import backend, { AuthorityDto, ConflictError, ForbiddenError, MemberDto, NotFoundError, PaymentRequiredError, UserDto, VaultDto, VaultRole } from '../common/backend';
+import backend, { AuthorityDto, ConflictError, ForbiddenError, LicenseUserInfoDto, MemberDto, NotFoundError, PaymentRequiredError, UserDto, VaultDto, VaultRole } from '../common/backend';
 import { BrowserKeys, UserKeys, VaultKeys } from '../common/crypto';
 import { JWT, JWTHeader } from '../common/jwt';
 import ArchiveVaultDialog from './ArchiveVaultDialog.vue';
@@ -202,18 +224,19 @@ import FetchError from './FetchError.vue';
 import GrantPermissionDialog from './GrantPermissionDialog.vue';
 import ReactivateVaultDialog from './ReactivateVaultDialog.vue';
 import RecoverVaultDialog from './RecoverVaultDialog.vue';
-import RecoveryKeyDialog from './RecoveryKeyDialog.vue';
+import DisplayRecoveryKeyDialog from './DisplayRecoveryKeyDialog.vue';
 import SearchInputGroup from './SearchInputGroup.vue';
 
 const { t, d } = useI18n({ useScope: 'global' });
 
 const props = defineProps<{
   vaultId: string,
-  role: VaultRole
+  vaultRole: VaultRole | 'NONE',
 }>();
 
 const emit = defineEmits<{
   vaultUpdated: [updatedVault: VaultDto]
+  licenseStatusUpdated: [license: LicenseUserInfoDto]
 }>();
 
 const onFetchError = ref<Error | null>();
@@ -222,7 +245,7 @@ const allowRetryFetch = computed(() => onFetchError.value != null && !(onFetchEr
 const onUpdateVaultMembershipError = ref< {[id: string]: Error} >({});
 const onAddUserError = ref<Error | null>();
 
-const paymentRequired = ref(false);
+const license = ref<LicenseUserInfoDto>();
 const addingUser = ref(false);
 const grantingPermission = ref(false);
 const grantPermissionDialog = ref<typeof GrantPermissionDialog>();
@@ -230,13 +253,13 @@ const editingVaultMetadata = ref(false);
 const editVaultMetadataDialog = ref<typeof EditVaultMetadataDialog>();
 const downloadingVaultTemplate = ref(false);
 const downloadVaultTemplateDialog = ref<typeof DownloadVaultTemplateDialog>();
-const showingRecoveryKey = ref(false);
-const recoveryKeyDialog = ref<typeof RecoveryKeyDialog>();
+const displayingRecoveryKey = ref(false);
+const displayRecoveryKeyDialog = ref<typeof DisplayRecoveryKeyDialog>();
 const archivingVault = ref(false);
 const archiveVaultDialog = ref<typeof ArchiveVaultDialog>();
 const reactivatingVault = ref(false);
 const reactivateVaultDialog = ref<typeof ReactivateVaultDialog>();
-const recoverVault = ref(false);
+const recoveringVault = ref(false);
 const recoverVaultDialog = ref<typeof RecoverVaultDialog>();
 const vault = ref<VaultDto>();
 const vaultKeys = ref<VaultKeys>();
@@ -246,19 +269,23 @@ const claimVaultOwnershipDialog = ref<typeof ClaimVaultOwnershipDialog>();
 const claimingVaultOwnership = ref(false);
 const me = ref<UserDto>();
 
-const vaultRecoveryRequired = ref<boolean | null>(null);
+const vaultRecoveryRequired = ref<boolean>(false);
+const isAdmin = ref<boolean>();
+
+const isLegacyVault = computed(() => vault.value?.authPublicKey != null);
+const licenseViolated = computed(() => license.value?.isExpired() || license.value?.isExceeded());
 
 onMounted(fetchData);
 
 async function fetchData() {
   onFetchError.value = null;
   try {
+    isAdmin.value = (await auth).isAdmin();
     vault.value = await backend.vaults.get(props.vaultId);
     me.value = await backend.users.me(true);
-    if (props.role == 'OWNER') {
+    license.value = await backend.license.getUserInfo();
+    if (props.vaultRole == 'OWNER') {
       await fetchOwnerData();
-    } else {
-      vaultRecoveryRequired.value = false;
     }
   } catch (error) {
     console.error('Fetching data failed.', error);
@@ -273,12 +300,12 @@ async function fetchOwnerData() {
     vaultRecoveryRequired.value = false;
     const vaultKeyJwe = await backend.vaults.accessToken(props.vaultId, true);
     vaultKeys.value = await loadVaultKeys(vaultKeyJwe);
-    paymentRequired.value = false;
   } catch (error) {
     if (error instanceof ForbiddenError) {
       vaultRecoveryRequired.value = true;
     } else if (error instanceof PaymentRequiredError) {
-      paymentRequired.value = true;
+      //refetch license
+      await refreshLicense();
     } else {
       console.error('Retrieving ownership failed.', error);
       onFetchError.value = error instanceof Error ? error : new Error('Unknown Error');
@@ -403,9 +430,9 @@ function showDownloadVaultTemplateDialog() {
   nextTick(() => downloadVaultTemplateDialog.value?.show());
 }
 
-function showRecoveryKeyDialog() {
-  showingRecoveryKey.value = true;
-  nextTick(() => recoveryKeyDialog.value?.show());
+function showDisplayRecoveryKeyDialog() {
+  displayingRecoveryKey.value = true;
+  nextTick(() => displayRecoveryKeyDialog.value?.show());
 }
 
 function showArchiveVaultDialog() {
@@ -419,7 +446,7 @@ function showReactivateVaultDialog() {
 }
 
 function showRecoverVaultDialog() {
-  recoverVault.value = true;
+  recoveringVault.value = true;
   nextTick(() => recoverVaultDialog.value?.show());
 }
 
@@ -427,16 +454,16 @@ function permissionGranted() {
   usersRequiringAccessGrant.value = [];
 }
 
+async function refreshLicense() {
+  license.value = await backend.license.getUserInfo();
+  emit('licenseStatusUpdated', license.value);
+}
+
 function refreshVault(updatedVault: VaultDto) {
   vault.value = updatedVault;
   emit('vaultUpdated', updatedVault);
 }
 
-async function reloadView() {
-  await fetchOwnerData();
-  vaultRecoveryRequired.value = false;
-}
-
 async function searchAuthority(query: string): Promise<AuthorityDto[]> {
   return (await backend.authorities.search(query))
     .filter(authority => !members.value.has(authority.id))
@@ -470,11 +497,10 @@ async function removeMember(memberId: string) {
   try {
     await backend.vaults.removeAuthority(props.vaultId, memberId);
     members.value.delete(memberId);
-    if (!paymentRequired.value) {
+    if (!licenseViolated.value) {
       usersRequiringAccessGrant.value = await backend.vaults.getUsersRequiringAccessGrant(props.vaultId);
     } else {
-      // reload, maybe removing memberId fixed the license issue
-      await fetchData();
+      await refreshLicense();
     }
   } catch (error) {
     console.error('Removing member access failed.', error);
diff --git a/frontend/src/components/VaultList.vue b/frontend/src/components/VaultList.vue
index a7052720a..a45cddbef 100644
--- a/frontend/src/components/VaultList.vue
+++ b/frontend/src/components/VaultList.vue
@@ -110,7 +110,7 @@
   </div>
 
   <SlideOver v-if="selectedVault != null" ref="vaultDetailsSlideOver" :title="selectedVault.name" @close="selectedVault = null">
-    <VaultDetails :vault-id="selectedVault.id" :role="ownsSelectedVault ? 'OWNER' : 'MEMBER'" @vault-updated="v => onSelectedVaultUpdate(v)"></VaultDetails>
+    <VaultDetails :vault-id="selectedVault.id" :vault-role="roleOfSelectedVault" @vault-updated="v => onSelectedVaultUpdate(v)" @license-status-updated="l => licenseUpdated(l)"></VaultDetails>
   </SlideOver>
 </template>
 
@@ -121,7 +121,7 @@ import { CheckIcon, ChevronRightIcon, ChevronUpDownIcon } from '@heroicons/vue/2
 import { computed, nextTick, onMounted, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import auth from '../common/auth';
-import backend, { LicenseUserInfoDto, VaultDto } from '../common/backend';
+import backend, { LicenseUserInfoDto, VaultDto, VaultRole } from '../common/backend';
 import FetchError from './FetchError.vue';
 import LicenseAlert from './LicenseAlert.vue';
 import SlideOver from './SlideOver.vue';
@@ -133,10 +133,18 @@ const vaultDetailsSlideOver = ref<typeof SlideOver>();
 const onFetchError = ref<Error | null>();
 
 const vaults = ref<VaultDto[]>();
+const accessibleVaults = ref<VaultDto[]>();
 const ownedVaults = ref<VaultDto[]>();
 const selectedVault = ref<VaultDto | null>(null);
-const ownsSelectedVault = computed(() => {
-  return ownedVaults.value?.some(ownedVault => ownedVault.id == selectedVault.value?.id);
+
+const roleOfSelectedVault = computed<VaultRole | 'NONE'>(() => {
+  if (ownedVaults.value?.some(ownedVault => ownedVault.id == selectedVault.value?.id)) {
+    return 'OWNER';
+  } else if (accessibleVaults.value?.some(accessibleVault => accessibleVault.id == selectedVault.value?.id)) {
+    return 'MEMBER';
+  } else {
+    return 'NONE';
+  }
 });
 
 const isAdmin = ref<boolean>();
@@ -174,10 +182,11 @@ async function fetchData() {
     if (isAdmin.value) {
       filterOptions.value['allVaults'] = t('vaultList.filter.entry.allVaults');
     }
+    accessibleVaults.value = (await backend.vaults.listAccessible()).filter(v => !v.archived).sort((a, b) => a.name.localeCompare(b.name));
     ownedVaults.value = (await backend.vaults.listAccessible('OWNER')).sort((a, b) => a.name.localeCompare(b.name));
     switch (selectedFilter.value) {
       case 'accessibleVaults':
-        vaults.value = (await backend.vaults.listAccessible()).filter(v => !v.archived).sort((a, b) => a.name.localeCompare(b.name));
+        vaults.value = accessibleVaults.value;
         break;
       case 'ownedVaults':
         vaults.value = ownedVaults.value;
@@ -212,4 +221,8 @@ async function onSelectedVaultUpdate(vault: VaultDto) {
     selectedVault.value = vault;
   }
 }
+
+async function licenseUpdated(license: LicenseUserInfoDto) {
+  licenseStatus.value = license;
+}
 </script>
diff --git a/frontend/src/i18n/de-DE.json b/frontend/src/i18n/de-DE.json
index 21b5cdfcd..cf9a49d15 100644
--- a/frontend/src/i18n/de-DE.json
+++ b/frontend/src/i18n/de-DE.json
@@ -208,7 +208,6 @@
   "userProfile.actions.manageAccount": "Account verwalten",
   "userProfile.actions.changeLanguage": "Sprache ändern",
 
-  "vaultDetails.claimOwnership": "Eigentümer werden",
   "vaultDetails.description.header": "Beschreibung",
   "vaultDetails.description.empty": "Keine Beschreibung vorhanden.",
   "vaultDetails.information.header": "Information",
@@ -222,13 +221,14 @@
   "vaultDetails.actions.updatePermissions.reload": "Neu laden",
   "vaultDetails.actions.editVaultMetadata": "Tresor-Metadaten bearbeiten",
   "vaultDetails.actions.downloadVaultTemplate": "Tresor-Vorlage herunterladen",
-  "vaultDetails.actions.showRecoveryKey": "Wiederherstellungsschlüssel anzeigen",
+  "vaultDetails.actions.displayRecoveryKey": "Wiederherstellungsschlüssel anzeigen",
   "vaultDetails.actions.archiveVault": "Tresor archivieren",
   "vaultDetails.actions.reactivateVault": "Tresor reaktivieren",
-  "vaultDetails.error.paymentRequired": "Deine Cryptomator Hub Lizenz hat die Anzahl der verfügbaren Sitze überschritten oder ist abgelaufen. Bitte informiere einen Hub-Administrator, um die Lizenz zu erneuern oder zu erweitern.",
+  "vaultDetails.actions.claimOwnership": "Eigentümer werden",
+  "vaultDetails.error.licenseViolated": "Deine Cryptomator Hub Lizenz hat die Anzahl der verfügbaren Sitze überschritten oder ist abgelaufen. Bitte informiere einen Hub-Administrator, um die Lizenz zu erneuern oder zu erweitern.",
   "vaultDetails.recoverVault.title": "Du hast deinen Account zurückgesetzt!",
   "vaultDetails.recoverVault.description": "Um wieder Zugriff auf den Tresor zu erhalten, musst du deinen Zugriff mit dem Wiederherstellungsschlüssel wiederherstellen oder ein anderer Eigentümer muss die Zugriffsrechte aktualisieren.",
-  "vaultDetails.recoverVault": "Tresorzugriff wiederherstellen",
+  "vaultDetails.actions.recoverVault": "Tresorzugriff wiederherstellen",
 
   "vaultList.title": "Tresore",
   "vaultList.empty.title": "Keine Tresore",
diff --git a/frontend/src/i18n/en-US.json b/frontend/src/i18n/en-US.json
index edf588db8..4fa0e26dd 100644
--- a/frontend/src/i18n/en-US.json
+++ b/frontend/src/i18n/en-US.json
@@ -208,7 +208,6 @@
   "userProfile.actions.manageAccount": "Manage Account",
   "userProfile.actions.changeLanguage": "Change Language",
 
-  "vaultDetails.claimOwnership": "Claim Ownership",
   "vaultDetails.warning.archived": "This vault is archived and cannot be unlocked.",
   "vaultDetails.description.header": "Description",
   "vaultDetails.description.empty": "No description provided.",
@@ -223,13 +222,14 @@
   "vaultDetails.actions.updatePermissions.reload": "Reload",
   "vaultDetails.actions.editVaultMetadata": "Edit Vault Metadata",
   "vaultDetails.actions.downloadVaultTemplate": "Download Vault Template",
-  "vaultDetails.actions.showRecoveryKey": "Show Recovery Key",
+  "vaultDetails.actions.displayRecoveryKey": "Show Recovery Key",
   "vaultDetails.actions.archiveVault": "Archive Vault",
   "vaultDetails.actions.reactivateVault": "Reactivate Vault",
-  "vaultDetails.error.paymentRequired": "Your Cryptomator Hub license has expired or you exceeded the number of licensed seats. Please inform a Hub administrator renew or upgrade the license.",
+  "vaultDetails.actions.claimOwnership": "Claim Ownership",
+  "vaultDetails.actions.recoverVault": "Recover Vault Access",
+  "vaultDetails.error.licenseViolated": "Your Cryptomator Hub license has expired or you exceeded the number of licensed seats. Please inform a Hub administrator renew or upgrade the license.",
   "vaultDetails.recoverVault.title": "You have Reset Your Account!",
   "vaultDetails.recoverVault.description": "To regain access to the vault, you must restore your access using the recovery key or another owner must update the access permissions.",
-  "vaultDetails.recoverVault": "Recover Vault Access",
 
   "vaultList.title": "Vaults",
   "vaultList.empty.title": "No vaults",