diff --git a/app/exchange.go b/app/exchange.go
index 00446a1..4eda744 100644
--- a/app/exchange.go
+++ b/app/exchange.go
@@ -87,18 +87,10 @@ func (m NotifyMBox) GetInboundAnswers(p []fbb.Proposal) []fbb.ProposalAnswer {
 		}
 	}
 	if hasAccountActivation {
-		// CMS will currently enforce the password even if the message is deferred or transfer fails.
-		// If we don't accept it now, the user risks being locked out of their account.
-		// Fingers crossed that the connection does not fail.
-		if true { // Make vet happy
-			return answers
-		}
-
-		// TODO: If the above issue is ever resolved by WTD, do this instead:
 		res := <-m.promptHub.Prompt(
 			context.Background(),
 			time.Minute,
-			PromptKindAccountActivation,
+			types.PromptKindAccountActivation,
 			"Important: Your New Account Password",
 		)
 		if declined := res.Value != "accept"; declined {
diff --git a/cli/prompter.go b/cli/prompter.go
index fd5e06a..4ed79fe 100644
--- a/cli/prompter.go
+++ b/cli/prompter.go
@@ -68,9 +68,7 @@ func (t TerminalPrompter) Prompt(prompt app.Prompt) {
 		fmt.Println()
 		fmt.Println("WARNING: We were unable to confirm that your Winlink account is active.")
 		fmt.Println("If you continue, an over-the-air activation will be initiated and you will receive a message with a new password.")
-		fmt.Println("This password will be the only key to your account:")
-		fmt.Println("- If you lose the password, it cannot be recovered.")
-		fmt.Println("- If you fail to receive it, you will be permanently locked out of your account.")
+		fmt.Println("This password will be the only key to your account. If you lose it, it cannot be recovered.")
 		fmt.Printf("It is strongly recommended to use '%s init' or the web gui to create your account before proceeding.\n", os.Args[0])
 		fmt.Println()
 		for prompt.Err() == nil {
diff --git a/web/src/js/modules/prompt/index.js b/web/src/js/modules/prompt/index.js
index 9a570a8..8170c2c 100644
--- a/web/src/js/modules/prompt/index.js
+++ b/web/src/js/modules/prompt/index.js
@@ -233,13 +233,7 @@ export class PromptModal {
         ).append(
           $('<p>').text('If you continue, an over-the-air activation will be initiated and you will receive a message with a new password.')
         ).append(
-          $('<p>').text('This password will be the only key to your account:')
-        ).append(
-          $('<ul>').append(
-            $('<li>').text('If you lose the password, it cannot be recovered.')
-          ).append(
-            $('<li>').text('If you fail to receive it, you will be permanently locked out of your account.')
-          )
+          $('<p>').text('This password will be the only key to your account. If you lose it, it cannot be recovered.')
         ).append(
           $('<p>').html('It is strongly recommended to create your account before proceeding.')
         );