diff --git a/doc/xml/reference.xml b/doc/xml/reference.xml
index 86c1b0559d..7399b91ee1 100644
--- a/doc/xml/reference.xml
+++ b/doc/xml/reference.xml
@@ -2369,6 +2369,8 @@
 
                     <p>Note that <code>pg_create_restore_point('pgBackRest Archive Check')</code> and <code>pg_switch_xlog()</code>/<code>pg_switch_wal()</code> are called to force <postgres/> to archive a WAL segment.</p>
 
+                    <p>The <cmd>check</cmd> command warns while <br-option>repo-cipher-pass-old</br-option> is set and reports whether the stanza has been rekeyed. Otherwise it warns when <br-option>repo-cipher-pass</br-option> is the example passphrase from the documentation or, at <br-option>repo-format</br-option> 6 or higher, is not a generated passphrase, with a hint to change it with the <cmd>stanza-rekey</cmd> command.</p>
+
                     <!-- Note, linking to the User Guide is limited since it can cause a cyclical reference -->
                 </text>
 
@@ -3030,6 +3032,8 @@
                 <text>
                     <p>Immediately after upgrading <postgres/> to a newer major version, the <br-option>pg-path</br-option> for all <backrest/> configurations must be set to the new database location and the <cmd>stanza-upgrade</cmd> command run. If there is more than one repository configured on the host, the stanza will be upgraded on each. If the database is offline use the <br-option>--no-online</br-option> option.</p>
 
+                    <p>A warning is logged when <br-option>repo-cipher-pass</br-option> is the example passphrase from the documentation or, at <br-option>repo-format</br-option> 6 or higher, is not a generated passphrase, with a hint to change it with the <cmd>stanza-rekey</cmd> command. There is no warning while <br-option>repo-cipher-pass-old</br-option> is set.</p>
+
                     <!-- Note, linking to the User Guide is limited since it can cause a cyclical reference -->
                 </text>
 
diff --git a/src/command/check/check.c b/src/command/check/check.c
index db2500e3f5..5e50a16bb5 100644
--- a/src/command/check/check.c
+++ b/src/command/check/check.c
@@ -9,6 +9,7 @@ Check Command
 #include "command/check/check.h"
 #include "command/check/common.h"
 #include "command/check/report.h"
+#include "command/stanza/common.h"
 #include "common/debug.h"
 #include "common/io/fdWrite.h"
 #include "common/log.h"
@@ -160,9 +161,9 @@ checkPrimary(const DbGetResult dbGroup)
     FUNCTION_LOG_RETURN_VOID();
 }
 
-// Warn when the old passphrase is set
+// Warn about the old passphrase when it is set and otherwise about the passphrase
 static void
-checkCipherPassOld(void)
+checkCipherPass(void)
 {
     FUNCTION_LOG_VOID(logLevelDebug);
 
@@ -185,6 +186,8 @@ checkCipherPassOld(void)
                     cfgOptionIdxName(cfgOptRepoCipherPassOld, repoIdx));
             }
         }
+        else
+            stanzaCipherPassCheck(repoIdx, infoBackupFormat(infoBackupRepoIdxP(repoIdx)), NULL);
     }
 
     FUNCTION_LOG_RETURN_VOID();
@@ -249,7 +252,7 @@ cmdCheck(void)
                 const unsigned int pgPathDefinedTotal = checkManifest();
                 checkStandby(dbGroup, pgPathDefinedTotal);
                 checkPrimary(dbGroup);
-                checkCipherPassOld();
+                checkCipherPass();
             }
         }
     }
diff --git a/src/command/stanza/common.c b/src/command/stanza/common.c
index 26bf510609..9726d555b7 100644
--- a/src/command/stanza/common.c
+++ b/src/command/stanza/common.c
@@ -169,29 +169,43 @@ stanzaCipherPassCheck(const unsigned int repoIdx, const unsigned int format, con
         FUNCTION_TEST_PARAM(STRINGZ, action);
     FUNCTION_TEST_END();
 
-    ASSERT(action != NULL);
-
     if (cfgOptionIdxStrId(cfgOptRepoCipherType, repoIdx) != cipherTypeNone)
     {
-        // Error when the passphrase is a documentation example
+        // Error or warn when the passphrase is a documentation example
         if (strBeginsWithZ(cfgOptionIdxStr(cfgOptRepoCipherPass, repoIdx), CIPHER_PASS_EXAMPLE_PREFIX))
         {
-            THROW_FMT(
-                OptionInvalidValueError,
-                "option '%s' must not be the example passphrase from the documentation\n"
-                "HINT: generate a passphrase with 'openssl rand -base64 32'.",
+            if (action != NULL)
+            {
+                THROW_FMT(
+                    OptionInvalidValueError,
+                    "option '%s' must not be the example passphrase from the documentation\n"
+                    "HINT: generate a passphrase with 'openssl rand -base64 32'.",
+                    cfgOptionIdxName(cfgOptRepoCipherPass, repoIdx));
+            }
+
+            LOG_WARN_FMT(
+                "option '%s' should not be the example passphrase from the documentation\n"
+                "HINT: generate a passphrase with 'openssl rand -base64 32' and change it with " CFGCMD_STANZA_REKEY ".",
                 cfgOptionIdxName(cfgOptRepoCipherPass, repoIdx));
         }
-
         // Format >= 6 requires the passphrase to look generated
-        if (format >= REPOSITORY_FORMAT_6 && !cipherPassGenerated(cfgCipherSpecMainIdx(repoIdx)))
+        else if (format >= REPOSITORY_FORMAT_6 && !cipherPassGenerated(cfgCipherSpecMainIdx(repoIdx)))
         {
-            THROW_FMT(
-                OptionInvalidValueError,
-                "option '%s' must be at least 256 random bits encoded as hex, base64, or base64url to %s at repository format "
+            if (action != NULL)
+            {
+                THROW_FMT(
+                    OptionInvalidValueError,
+                    "option '%s' must be at least 256 random bits encoded as hex, base64, or base64url to %s at repository format "
+                    STRINGIFY(REPOSITORY_FORMAT_6) " or higher\n"
+                    "HINT: generate a passphrase with 'openssl rand -base64 32'.",
+                    cfgOptionIdxName(cfgOptRepoCipherPass, repoIdx), action);
+            }
+
+            LOG_WARN_FMT(
+                "option '%s' should be at least 256 random bits encoded as hex, base64, or base64url at repository format "
                 STRINGIFY(REPOSITORY_FORMAT_6) " or higher\n"
-                "HINT: generate a passphrase with 'openssl rand -base64 32'.",
-                cfgOptionIdxName(cfgOptRepoCipherPass, repoIdx), action);
+                "HINT: generate a passphrase with 'openssl rand -base64 32' and change it with " CFGCMD_STANZA_REKEY ".",
+                cfgOptionIdxName(cfgOptRepoCipherPass, repoIdx));
         }
     }
 
diff --git a/src/command/stanza/common.h b/src/command/stanza/common.h
index ab2903d1c5..08ae68d892 100644
--- a/src/command/stanza/common.h
+++ b/src/command/stanza/common.h
@@ -14,7 +14,7 @@ Functions
 FN_EXTERN CipherSpec *cipherSpecGen(CipherType cipherType, unsigned int format);
 
 // Error when the passphrase of an encrypted repository is a documentation example or, at Format >= 6, does not look generated. The
-// action completes the error message, e.g. "create a stanza".
+// action completes the error message, e.g. "create a stanza". When the action is NULL warn instead of error.
 FN_EXTERN void stanzaCipherPassCheck(unsigned int repoIdx, unsigned int format, const char *action);
 
 // Validate and return database information
diff --git a/src/command/stanza/upgrade.c b/src/command/stanza/upgrade.c
index 22ab6eefff..560913486e 100644
--- a/src/command/stanza/upgrade.c
+++ b/src/command/stanza/upgrade.c
@@ -144,6 +144,10 @@ cmdStanzaUpgrade(void)
                     "stanza '%s' on %s is already up to date", strZ(cfgOptionDisplay(cfgOptStanza)),
                     cfgOptionGroupName(cfgOptGrpRepo, repoIdx));
             }
+
+            // Warn about the passphrase unless repo-cipher-pass-old is set
+            if (!cfgOptionIdxTest(cfgOptRepoCipherPassOld, repoIdx))
+                stanzaCipherPassCheck(repoIdx, format, NULL);
         }
     }
     MEM_CONTEXT_TEMP_END();
diff --git a/test/spec-rekey.md b/test/spec-rekey.md
index e9f260f8c6..80323bb16c 100644
--- a/test/spec-rekey.md
+++ b/test/spec-rekey.md
@@ -110,6 +110,7 @@ cipher-pass={"1":{"key":"afg...","digest":"sha256"}, ...}
 - The old spec is attached to the main spec by `cfgCipherSpecMainIdx()`, so the info file call sites are unchanged and only the info load retries.
 - A command that saves an info file with the fallback in effect keeps the old passphrase. Backup saves both info files on completion, so using the new passphrase here would lock out a host that has not been updated. Hosts can be updated at any pace and the config can be reverted any time before the rekey.
 - `stanza-upgrade` to format 6 before the rekey writes format 6 info files with the old passphrase, which `stanzaCipherPassCheck()` does not check. `stanza-rekey` replaces it and checks the new passphrase.
+- `stanza-upgrade` and `check` warn when `repo-cipher-pass` would fail `stanzaCipherPassCheck()` at the repository format, with a hint to change it with `stanza-rekey`. Rekeying during `stanza-upgrade` would need the same config change on every host as a rekey, so it saves one command and adds a second rekey path. Neither warns while `repo-cipher-pass-old` is set since `stanza-rekey` checks the new passphrase.
 - A full backup before the rekey stores its key in an info file encrypted with the old passphrase and the rekey does not replace that key. After an exposure the next full backup after the rekey replaces it.
 - `verify` reads the info files itself rather than through the info load, so it retries with the prior spec in `verifyInfoFile()` and reports a file read that way at detail level. When both reads fail it reports the error from `repo-cipher-pass`.
 - `repo-get` reads an info file directly and does not fall back. Until the stanza is rekeyed, it can read an info file only when `repo-cipher-pass` is the passphrase it was encrypted with.
diff --git a/test/src/module/command/checkTest.c b/test/src/module/command/checkTest.c
index 0455757888..bfbadce606 100644
--- a/test/src/module/command/checkTest.c
+++ b/test/src/module/command/checkTest.c
@@ -553,7 +553,7 @@ testRun(void)
         infoArchiveCipherPriorClear(infoArchiveRepoIdx(1));
         infoArchiveRepoIdxSave(1);
 
-        TEST_RESULT_VOID(checkCipherPassOld(), "backup info has old passphrase");
+        TEST_RESULT_VOID(checkCipherPass(), "backup info has old passphrase");
         TEST_RESULT_LOG(
             "P00   WARN: option 'repo2-cipher-pass-old' is set and the stanza has not been rekeyed\n"
             "            HINT: run stanza-rekey and then remove the option.");
@@ -562,13 +562,30 @@ testRun(void)
         infoBackupCipherPriorClear(infoBackupRepoIdxP(1));
         infoBackupRepoIdxSave(1);
 
-        TEST_RESULT_VOID(checkCipherPassOld(), "info files have new passphrase");
+        TEST_RESULT_VOID(checkCipherPass(), "info files have new passphrase");
         TEST_RESULT_LOG(
             "P00   WARN: option 'repo2-cipher-pass-old' is set and the stanza has been rekeyed\n"
             "            HINT: remove the option.");
 
-        hrnCfgEnvKeyRemoveRaw(cfgOptRepoCipherPass, 2);
+        // Save the info files with the example passphrase
+        hrnCfgEnvKeyRawZ(cfgOptRepoCipherPass, 2, "zWaf6XtpjIVZC5444yXB+cgFDFl7MxGlgkZSaoPvTGi=");
+        hrnCfgEnvKeyRawZ(cfgOptRepoCipherPassOld, 2, "new");
+        HRN_CFG_LOAD(cfgCmdCheck, argList);
+
+        infoArchiveCipherPriorClear(infoArchiveRepoIdx(1));
+        infoArchiveRepoIdxSave(1);
+        infoBackupCipherPriorClear(infoBackupRepoIdxP(1));
+        infoBackupRepoIdxSave(1);
+
         hrnCfgEnvKeyRemoveRaw(cfgOptRepoCipherPassOld, 2);
+        HRN_CFG_LOAD(cfgCmdCheck, argList);
+
+        TEST_RESULT_VOID(checkCipherPass(), "example passphrase");
+        TEST_RESULT_LOG(
+            "P00   WARN: option 'repo2-cipher-pass' should not be the example passphrase from the documentation\n"
+            "            HINT: generate a passphrase with 'openssl rand -base64 32' and change it with stanza-rekey.");
+
+        hrnCfgEnvKeyRemoveRaw(cfgOptRepoCipherPass, 2);
 
         // -------------------------------------------------------------------------------------------------------------------------
         TEST_TITLE("Primary == NULL (for test coverage)");
diff --git a/test/src/module/command/stanzaTest.c b/test/src/module/command/stanzaTest.c
index 0299f68cd6..fe280d3315 100644
--- a/test/src/module/command/stanzaTest.c
+++ b/test/src/module/command/stanzaTest.c
@@ -1362,7 +1362,10 @@ testRun(void)
         TEST_RESULT_VOID(cmdStanzaUpgrade(), "stanza upgrade - format 6 on encrypted repo");
         TEST_RESULT_LOG(
             "P00   INFO: stanza-upgrade for stanza 'db' on repo1\n"
-            "P00   INFO: upgrade repository format from 5 to 6");
+            "P00   INFO: upgrade repository format from 5 to 6\n"
+            "P00   WARN: option 'repo1-cipher-pass' should be at least 256 random bits encoded as hex, base64, or base64url at"
+            " repository format 6 or higher\n"
+            "            HINT: generate a passphrase with 'openssl rand -base64 32' and change it with stanza-rekey.");
 
         // The pass is unchanged by the migration, so a file it encrypted before the migration must still be readable. The digest
         // the pass derives with cannot follow the format of the info file storing it or this read would fail.
@@ -1395,6 +1398,43 @@ testRun(void)
         TEST_RESULT_STR_Z(
             strNewBuf(storageGetP(walRead)), "WAL BEFORE MIGRATION", "wal from before the migration is still readable");
 
+        // -------------------------------------------------------------------------------------------------------------------------
+        TEST_TITLE("stanza-upgrade - example passphrase");
+
+        // Save the info files with the example passphrase
+        const CipherSpec *const cipherSpecExample = cipherSpecNewP(
+            cipherTypeAes256Cbc, BUFSTRDEF("zWaf6XtpjIVZC5444yXB+cgFDFl7MxGlgkZSaoPvTGi="));
+
+        infoArchiveSaveFile(
+            infoArchiveLoadFile(storageRepoIdx(0), INFO_ARCHIVE_PATH_FILE_STR, cipherSpecMain), storageRepoIdxWrite(0),
+            INFO_ARCHIVE_PATH_FILE_STR, cipherSpecExample);
+
+        InfoBackup *const infoBackupExample = infoBackupLoadFile(storageRepoIdx(0), INFO_BACKUP_PATH_FILE_STR, cipherSpecMain);
+        infoBackupFormatSet(infoBackupExample, REPOSITORY_FORMAT_6);
+        infoBackupSaveFile(infoBackupExample, storageRepoIdxWrite(0), INFO_BACKUP_PATH_FILE_STR, cipherSpecExample);
+
+        hrnCfgEnvKeyRawZ(cfgOptRepoCipherPass, 1, "zWaf6XtpjIVZC5444yXB+cgFDFl7MxGlgkZSaoPvTGi=");
+        HRN_CFG_LOAD(cfgCmdStanzaUpgrade, argList);
+
+        TEST_RESULT_VOID(cmdStanzaUpgrade(), "stanza upgrade");
+        TEST_RESULT_LOG(
+            "P00   INFO: stanza-upgrade for stanza 'db' on repo1\n"
+            "P00   INFO: stanza 'db' on repo1 is already up to date\n"
+            "P00   WARN: option 'repo1-cipher-pass' should not be the example passphrase from the documentation\n"
+            "            HINT: generate a passphrase with 'openssl rand -base64 32' and change it with stanza-rekey.");
+
+        // -------------------------------------------------------------------------------------------------------------------------
+        TEST_TITLE("stanza-upgrade - no passphrase warning with the old passphrase set");
+
+        hrnCfgEnvKeyRawZ(cfgOptRepoCipherPassOld, 1, "12345678");
+        HRN_CFG_LOAD(cfgCmdStanzaUpgrade, argList);
+
+        TEST_RESULT_VOID(cmdStanzaUpgrade(), "stanza upgrade");
+        TEST_RESULT_LOG(
+            "P00   INFO: stanza-upgrade for stanza 'db' on repo1\n"
+            "P00   INFO: stanza 'db' on repo1 is already up to date");
+
+        hrnCfgEnvKeyRemoveRaw(cfgOptRepoCipherPassOld, 1);
         hrnCfgEnvKeyRemoveRaw(cfgOptRepoCipherPass, 1);
 
         // -------------------------------------------------------------------------------------------------------------------------
