diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26fbba3..bdee09d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,8 +10,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - The pre-activation key stage is now scheduled after the evaluation stage. The
-  rationale for this is that while iterating on evaluation errors it was often quite 
+  rationale for this is that while iterating on evaluation errors it was often quite
   annoying to repeatedly enter your password for key deployment.
+- Ipv6 addresses are now displayed in a nicer format in "Authenticate for ..."
+  prompts.
 
 ### Fixed
 
diff --git a/crates/core/src/commands/pty/mod.rs b/crates/core/src/commands/pty/mod.rs
index 54b2ff9..d6fbfdb 100644
--- a/crates/core/src/commands/pty/mod.rs
+++ b/crates/core/src/commands/pty/mod.rs
@@ -254,7 +254,13 @@ async fn print_authenticate_warning<S: AsRef<str>>(
         format!(
             "{}@{}:{}",
             target.user,
-            target.get_preferred_host()?,
+            target
+                .get_preferred_host()
+                .map(|host| if host.contains(':') {
+                    format!("[{host}]")
+                } else {
+                    host.to_string()
+                })?,
             target.port
         )
     } else {