diff --git a/src/AdminSettings.vue b/src/AdminSettings.vue
index aa5df51..9f0b458 100644
--- a/src/AdminSettings.vue
+++ b/src/AdminSettings.vue
@@ -18,11 +18,14 @@
 
 			<template v-if="tab === 'settings'">
 				<KeySetup :status="status" @changed="refresh" />
+				<Locations v-if="status.key.everConfirmed" :status="status" @changed="refresh" />
 			</template>
 			<template v-else-if="status.key.everConfirmed">
-				<Locations :status="status" @changed="refresh" />
-				<Backups v-if="status.targets.length" :status="status" @changed="refresh" />
-				<RestoreBrowser v-if="status.targets.length" :status="status" @changed="refresh" />
+				<template v-if="status.targets.length">
+					<Backups :status="status" @changed="refresh" />
+					<RestoreBrowser :status="status" @changed="refresh" />
+				</template>
+				<NcNoteCard v-else type="info">{{ t('ng_backup', 'Add a backup location under "Settings" first.') }}</NcNoteCard>
 			</template>
 			<NcNoteCard v-else type="warning">{{ t('ng_backup', 'Set up the backup key under "Settings" first.') }}</NcNoteCard>
 		</template>
diff --git a/src/components/RestoreBrowser.vue b/src/components/RestoreBrowser.vue
index 56b9739..d0f0f20 100644
--- a/src/components/RestoreBrowser.vue
+++ b/src/components/RestoreBrowser.vue
@@ -7,7 +7,7 @@
 		:description="t('ng_backup', 'Pick a restore point and a user folder or file. Restores run in the background and go through Nextcloud, so overwritten files keep their old content as a version and removed files go to the trash.')">
 		<div class="ngb-row">
 			<NcSelect v-model="target" :options="status.targets" label="name" :input-label="t('ng_backup', 'Location')" :clearable="false" />
-			<NcSelect v-if="target" v-model="snapshot" :options="snapshots" :get-option-label="snapshotLabel" :input-label="t('ng_backup', 'Restore point')" :clearable="false" />
+			<NcSelect v-if="target" v-model="snapshot" :options="snapshots" label="displayLabel" :input-label="t('ng_backup', 'Restore point')" :clearable="false" />
 		</div>
 
 		<template v-if="snapshot">
@@ -84,7 +84,8 @@ const crumbs = computed(() => {
 
 watch(target, async (tg) => {
 	snapshot.value = null
-	snapshots.value = tg ? await api.snapshots(tg.id) : []
+	const list = tg ? await api.snapshots(tg.id) : []
+	snapshots.value = list.map(s => ({ ...s, displayLabel: snapshotLabel(s) }))
 	snapshot.value = snapshots.value[0] ?? null
 }, { immediate: true })
 watch(snapshot, () => { selected.value = ''; open('data') })