diff --git a/client.go b/client.go
index b7b488b..16c40e4 100644
--- a/client.go
+++ b/client.go
@@ -103,6 +103,9 @@ func (client *Client) UserId() int {
 
 // Get the client's shown name.
 func (client *Client) ShownName() string {
+	if client.IsSuperUser() {
+		return "SuperUser"
+	}
 	if client.IsRegistered() {
 		return client.user.Name
 	}
diff --git a/server.go b/server.go
index a7b0d01..cb2bc71 100644
--- a/server.go
+++ b/server.go
@@ -413,7 +413,7 @@ func (server *Server) handleAuthenticate(client *Client, msg *Message) {
 
 	userstate := &mumbleproto.UserState{
 		Session:   proto.Uint32(client.Session),
-		Name:      proto.String(client.Username),
+		Name:      proto.String(client.ShownName()),
 		ChannelId: proto.Uint32(0),
 	}
 	if client.IsRegistered() {