diff --git a/src/panels/config/backup/components/overview/ha-backup-overview-onboarding.ts b/src/panels/config/backup/components/overview/ha-backup-overview-onboarding.ts
index ebce3ea554..a094cad22d 100644
--- a/src/panels/config/backup/components/overview/ha-backup-overview-onboarding.ts
+++ b/src/panels/config/backup/components/overview/ha-backup-overview-onboarding.ts
@@ -37,10 +37,7 @@ class HaBackupOverviewBackups extends LitElement {
           <p>
             Backups are essential for a reliable smart home. They help protect
             the work you've put into setting up your smart home, and if the
-            worst happens, you can get back up and running quickly. It is
-            recommended that you create a backup every day. You should keep
-            three backups in at least two different locations, one of which
-            should be off-site.
+            worst happens, you can get back up and running quickly.
           </p>
         </div>
         <div class="card-actions">
diff --git a/src/panels/config/backup/components/overview/ha-backup-overview-settings.ts b/src/panels/config/backup/components/overview/ha-backup-overview-settings.ts
index 5936937b19..3b3f56cdfb 100644
--- a/src/panels/config/backup/components/overview/ha-backup-overview-settings.ts
+++ b/src/panels/config/backup/components/overview/ha-backup-overview-settings.ts
@@ -34,7 +34,7 @@ class HaBackupBackupsSummary extends LitElement {
     const { state: schedule } = config.schedule;
 
     if (schedule === BackupScheduleState.NEVER) {
-      return "Automatic backups are disabled";
+      return "Automatic backups are not scheduled";
     }
 
     let copiesText = "and keep all backups";
@@ -116,7 +116,7 @@ class HaBackupBackupsSummary extends LitElement {
 
     return html`
       <ha-card class="my-backups">
-        <div class="card-header">Automatic backups</div>
+        <div class="card-header">Backup settings</div>
         <div class="card-content">
           <ha-md-list>
             <ha-md-list-item
@@ -128,7 +128,7 @@ class HaBackupBackupsSummary extends LitElement {
                 ${this._scheduleDescription(this.config)}
               </div>
               <div slot="supporting-text">
-                Schedule and number of backups to keep
+                Automatic backup schedule and retention
               </div>
               <ha-icon-next slot="end"></ha-icon-next>
             </ha-md-list-item>
@@ -174,7 +174,7 @@ class HaBackupBackupsSummary extends LitElement {
         </div>
         <div class="card-actions">
           <ha-button @click=${this._configure}>
-            Configure automatic backups
+            Configure backup settings
           </ha-button>
         </div>
       </ha-card>
diff --git a/src/panels/config/backup/dialogs/dialog-backup-onboarding.ts b/src/panels/config/backup/dialogs/dialog-backup-onboarding.ts
index cb5b798c50..01f881de58 100644
--- a/src/panels/config/backup/dialogs/dialog-backup-onboarding.ts
+++ b/src/panels/config/backup/dialogs/dialog-backup-onboarding.ts
@@ -90,7 +90,7 @@ class DialogBackupOnboarding extends LitElement implements HassDialog {
 
   public showDialog(params: BackupOnboardingDialogParams): void {
     this._params = params;
-    this._step = STEPS[0];
+    this._step = params.skipWelcome ? STEPS[1] : STEPS[0];
     this._config = RECOMMENDED_CONFIG;
 
     const agents: string[] = [];
diff --git a/src/panels/config/backup/dialogs/show-dialog-backup_onboarding.ts b/src/panels/config/backup/dialogs/show-dialog-backup_onboarding.ts
index c411d6f0d7..0602077fc1 100644
--- a/src/panels/config/backup/dialogs/show-dialog-backup_onboarding.ts
+++ b/src/panels/config/backup/dialogs/show-dialog-backup_onboarding.ts
@@ -5,6 +5,7 @@ export interface BackupOnboardingDialogParams {
   submit?: (value: boolean) => void;
   cancel?: () => void;
   cloudStatus?: CloudStatus;
+  skipWelcome?: boolean;
 }
 
 const loadDialog = () => import("./dialog-backup-onboarding");
diff --git a/src/panels/config/backup/ha-config-backup-backups.ts b/src/panels/config/backup/ha-config-backup-backups.ts
index a0675e70b8..18d65557f0 100644
--- a/src/panels/config/backup/ha-config-backup-backups.ts
+++ b/src/panels/config/backup/ha-config-backup-backups.ts
@@ -304,7 +304,7 @@ class HaConfigBackupBackups extends SubscribeMixin(LitElement) {
         has-fab
         .tabs=${[
           {
-            translationKey: "ui.panel.config.backup.caption",
+            name: "My backups",
             path: `/config/backup/list`,
           },
         ]}
diff --git a/src/panels/config/backup/ha-config-backup-details.ts b/src/panels/config/backup/ha-config-backup-details.ts
index 248913fe5e..8c42bfe69f 100644
--- a/src/panels/config/backup/ha-config-backup-details.ts
+++ b/src/panels/config/backup/ha-config-backup-details.ts
@@ -143,6 +143,14 @@ class HaConfigBackupDetails extends LitElement {
                           )}
                           <span slot="supporting-text">Created</span>
                         </ha-md-list-item>
+                        <ha-md-list-item>
+                          <span slot="headline">
+                            ${this._backup.protected
+                              ? "Encrypted AES-128"
+                              : "Not encrypted"}
+                          </span>
+                          <span slot="supporting-text">Protected</span>
+                        </ha-md-list-item>
                       </ha-md-list>
                     </div>
                   </ha-card>
diff --git a/src/panels/config/backup/ha-config-backup-overview.ts b/src/panels/config/backup/ha-config-backup-overview.ts
index bc86bc8cc2..8080aef77b 100644
--- a/src/panels/config/backup/ha-config-backup-overview.ts
+++ b/src/panels/config/backup/ha-config-backup-overview.ts
@@ -73,12 +73,13 @@ class HaConfigBackupOverview extends LitElement {
 
   private _handleOnboardingButtonClick(ev) {
     ev.stopPropagation();
-    this._setupAutomaticBackup();
+    this._setupAutomaticBackup(true);
   }
 
-  private async _setupAutomaticBackup() {
+  private async _setupAutomaticBackup(skipWelcome = false) {
     const success = await showBackupOnboardingDialog(this, {
       cloudStatus: this.cloudStatus,
+      skipWelcome,
     });
     if (!success) {
       return;
diff --git a/src/panels/config/backup/ha-config-backup-settings.ts b/src/panels/config/backup/ha-config-backup-settings.ts
index 3387f6e1f8..8ec6ff1257 100644
--- a/src/panels/config/backup/ha-config-backup-settings.ts
+++ b/src/panels/config/backup/ha-config-backup-settings.ts
@@ -92,7 +92,7 @@ class HaConfigBackupSettings extends LitElement {
         back-path="/config/backup"
         .hass=${this.hass}
         .narrow=${this.narrow}
-        .header=${"Automatic backups"}
+        .header=${"Backup settings"}
       >
         <div class="content">
           <ha-card id="schedule">