@@ -3398,14 +3398,17 @@ key_method_2_read (struct buffer *buf, struct tls_multi *multi, struct tls_sessi

 	  if ((session->opt->ssl_flags & SSLF_USERNAME_AS_COMMON_NAME))

 	    set_common_name (session, up->username);

-	  msg (D_HANDSHAKE, "TLS: Username/Password authentication %s for username '%s' %s",

 #ifdef ENABLE_DEF_AUTH

+	  msg (D_HANDSHAKE, "TLS: Username/Password authentication %s for username '%s' %s",

 	       ks->auth_deferred ? "deferred" : "succeeded",

+	       up->username,

+	       (session->opt->ssl_flags & SSLF_USERNAME_AS_COMMON_NAME) ? "[CN SET]" : "");

 #else

+	  msg (D_HANDSHAKE, "TLS: Username/Password authentication %s for username '%s' %s",

 	       "succeeded",

-#endif

 	       up->username,

 	       (session->opt->ssl_flags & SSLF_USERNAME_AS_COMMON_NAME) ? "[CN SET]" : "");

+#endif

 	}

       else

 	{