diff --git a/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt
index f38ad009b..bd4fe6a35 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt
@@ -338,16 +338,18 @@ class ChannelFragment : ScreenFragment("Channel"), Logging {
                         .setRegion(model.region)
                         .setModemPreset(newModemPreset)
 
+                    val humanName = Channel(newSettings.build(), newLoRaConfig.build()).humanName
+                    binding.channelNameEdit.setText(humanName)
+
+                    val message = buildString {
+                        append(getString(R.string.are_you_sure_channel))
+                        if (!shouldUseRandomKey)
+                            append("\n\n" + getString(R.string.warning_default_psk).format(humanName))
+                    }
 
                     MaterialAlertDialogBuilder(requireContext())
                         .setTitle(R.string.change_channel)
-                        .setMessage(buildString {
-                            append(getString(R.string.are_you_sure_channel))
-                            if (!shouldUseRandomKey) {
-                                append("\n\n")
-                                append(getString(R.string.warning_default_channel))
-                            }
-                        })
+                        .setMessage(message)
                         .setNeutralButton(R.string.cancel) { _, _ ->
                             setGUIfromModel()
                         }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 389abfd46..4cbea2cab 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -155,5 +155,5 @@
     <string name="message">Message</string>
     <string name="mode_append">Append to message</string>
     <string name="mode_instant">Instantly send</string>
-    <string name="warning_default_channel">As you have not changed the channel name you are using the default encryption key (any Meshtastic user can read your messages).</string>
+    <string name="warning_default_psk">Empty channel names use the default encryption key (any device on %s can read your messages).</string>
 </resources>