diff --git a/components/buffer-header.js b/components/buffer-header.js
index 0eceb66..3436bdf 100644
--- a/components/buffer-header.js
+++ b/components/buffer-header.js
@@ -138,12 +138,16 @@ export default function BufferHeader(props) {
 				realname = stripANSI(props.user.realname || "");
 			}
 
-			let mask = null;
+			let details = [];
 			if (props.user.username && props.user.hostname) {
-				mask = `(${props.user.username}@${props.user.hostname})`;
+				details.push(`${props.user.username}@${props.user.hostname}`);
 			}
+			if (props.user.account) {
+				details.push(`authenticated as ${props.user.account}`);
+			}
+			details = details.length > 0 ? `(${details.join(", ")})` : null;
 
-			description = html`<${NickStatus} status=${status}/> ${realname} ${mask}`;
+			description = html`<${NickStatus} status=${status}/> ${realname} ${details}`;
 		}
 
 		actions = html`
diff --git a/components/member-list.js b/components/member-list.js
index 3004eb5..d2095f1 100644
--- a/components/member-list.js
+++ b/components/member-list.js
@@ -56,6 +56,10 @@ class MemberItem extends Component {
 			} else {
 				title = mask;
 			}
+
+			if (user.account) {
+				title += `\nAuthenticated as ${user.account}`;
+			}
 		}
 
 		return html`