diff --git a/api/jetstream/advisory/api_audit.go b/api/jetstream/advisory/api_audit.go
index 42cedd49..a438c014 100644
--- a/api/jetstream/advisory/api_audit.go
+++ b/api/jetstream/advisory/api_audit.go
@@ -41,14 +41,14 @@ func init() {
      Subject: {{ .Subject }}
       Client:
 {{- if .Client.User }}
-               User: {{ .Client.User }} Account: {{ .Client.Account }}
+                      User: {{ .Client.User }} Account: {{ .Client.Account }}
 {{- end }}
-               Host: {{ HostPort .Client.Host .Client.Port }}
-                CID: {{ .Client.CID }}
+                      Host: {{ HostPort .Client.Host .Client.Port }}
+                       CID: {{ .Client.CID }}
 {{- if .Client.Name }}
-               Name: {{ .Client.Name }}
+                      Name: {{ .Client.Name }}
 {{- end }}
-           Language: {{ .Client.Language }} {{ .Client.Version }}
+           Library Version: {{ .Client.Version }}  Language: {{ with .Client.Lang }}{{ . }}{{ else }}Unknown{{ end }}
 
     Request:
 {{ if .Request }}
diff --git a/api/jetstream/advisory/restore_complete.go b/api/jetstream/advisory/restore_complete.go
index c2a74530..85d0ed7c 100644
--- a/api/jetstream/advisory/restore_complete.go
+++ b/api/jetstream/advisory/restore_complete.go
@@ -34,14 +34,14 @@ func init() {
          Bytes: {{ .Bytes | IBytes }}
         Client:
 {{- if .Client.User }}
-               User: {{ .Client.User }} Account: {{ .Client.Account }}
+                      User: {{ .Client.User }} Account: {{ .Client.Account }}
 {{- end }}
-               Host: {{ HostPort .Client.Host .Client.Port }}
-                CID: {{ .Client.CID }}
+                      Host: {{ HostPort .Client.Host .Client.Port }}
+                       CID: {{ .Client.CID }}
 {{- if .Client.Name }}
-               Name: {{ .Client.Name }}
+                      Name: {{ .Client.Name }}
 {{- end }}
-           Language: {{ .Client.Language }} {{ .Client.Version }}
+           Library Version: {{ .Client.Version }}  Language: {{ with .Client.Lang }}{{ . }}{{ else }}Unknown{{ end }}
 `)
 	if err != nil {
 		panic(err)
diff --git a/api/jetstream/advisory/restore_create.go b/api/jetstream/advisory/restore_create.go
index 4ef9700a..a79ba0ac 100644
--- a/api/jetstream/advisory/restore_create.go
+++ b/api/jetstream/advisory/restore_create.go
@@ -26,14 +26,14 @@ func init() {
         Stream: {{ .Stream }}
         Client:
 {{- if .Client.User }}
-               User: {{ .Client.User }} Account: {{ .Client.Account }}
+                      User: {{ .Client.User }} Account: {{ .Client.Account }}
 {{- end }}
-               Host: {{ HostPort .Client.Host .Client.Port }}
-                CID: {{ .Client.CID }}
+                      Host: {{ HostPort .Client.Host .Client.Port }}
+                       CID: {{ .Client.CID }}
 {{- if .Client.Name }}
-               Name: {{ .Client.Name }}
+                      Name: {{ .Client.Name }}
 {{- end }}
-           Language: {{ .Client.Language }} {{ .Client.Version }}
+           Library Version: {{ .Client.Version }}  Language: {{ with .Client.Lang }}{{ . }}{{ else }}Unknown{{ end }}
 `)
 	if err != nil {
 		panic(err)
diff --git a/api/jetstream/advisory/snapshot_complete.go b/api/jetstream/advisory/snapshot_complete.go
index cf2e7229..403cf965 100644
--- a/api/jetstream/advisory/snapshot_complete.go
+++ b/api/jetstream/advisory/snapshot_complete.go
@@ -32,14 +32,14 @@ func init() {
           End: {{ .End | NanoTime }}
         Client:
 {{- if .Client.User }}
-               User: {{ .Client.User }} Account: {{ .Client.Account }}
+                     User: {{ .Client.User }} Account: {{ .Client.Account }}
 {{- end }}
-               Host: {{ HostPort .Client.Host .Client.Port }}
-                CID: {{ .Client.CID }}
+                     Host: {{ HostPort .Client.Host .Client.Port }}
+                      CID: {{ .Client.CID }}
 {{- if .Client.Name }}
-               Name: {{ .Client.Name }}
+                     Name: {{ .Client.Name }}
 {{- end }}
-           Language: {{ .Client.Language }} {{ .Client.Version }}
+          Library Version: {{ .Client.Version }}  Language: {{ with .Client.Lang }}{{ . }}{{ else }}Unknown{{ end }}
 `)
 	if err != nil {
 		panic(err)
diff --git a/api/jetstream/advisory/snapshot_create.go b/api/jetstream/advisory/snapshot_create.go
index 27734716..89616f54 100644
--- a/api/jetstream/advisory/snapshot_create.go
+++ b/api/jetstream/advisory/snapshot_create.go
@@ -29,14 +29,14 @@ func init() {
     Block Size: {{ .BlkSize | IBytes }}
         Client:
 {{- if .Client.User }}
-               User: {{ .Client.User }} Account: {{ .Client.Account }}
+                      User: {{ .Client.User }} Account: {{ .Client.Account }}
 {{- end }}
-               Host: {{ HostPort .Client.Host .Client.Port }}
-                CID: {{ .Client.CID }}
+                      Host: {{ HostPort .Client.Host .Client.Port }}
+                       CID: {{ .Client.CID }}
 {{- if .Client.Name }}
-               Name: {{ .Client.Name }}
+                      Name: {{ .Client.Name }}
 {{- end }}
-           Language: {{ .Client.Language }} {{ .Client.Version }}
+           Library Version: {{ .Client.Version }}  Language: {{ with .Client.Lang }}{{ . }}{{ else }}Unknown{{ end }}
 `)
 	if err != nil {
 		panic(err)
diff --git a/api/server/advisory/client_connect.go b/api/server/advisory/client_connect.go
index 1279967b..ded7c96a 100644
--- a/api/server/advisory/client_connect.go
+++ b/api/server/advisory/client_connect.go
@@ -29,17 +29,17 @@ func init() {
 {{- end }}
 
    Client:
-            ID: {{ .Client.ID }}
+                 ID: {{ .Client.ID }}
 {{- if .Client.User }}
-          User: {{ .Client.User }}
+               User: {{ .Client.User }}
 {{- end }}
 {{- if .Client.Name }}
-          Name: {{ .Client.Name }}
+               Name: {{ .Client.Name }}
 {{- end }}
-       Account: {{ .Client.Account }}
-       Library Version: {{ .Client.Version }}  Language: {{ with .Client.Lang }}{{ . }}{{ else }}Unknown{{ end }}
+            Account: {{ .Client.Account }}
+    Library Version: {{ .Client.Version }}  Language: {{ with .Client.Lang }}{{ . }}{{ else }}Unknown{{ end }}
 {{- if .Client.Host }}
-          Host: {{ .Client.Host }}
+               Host: {{ .Client.Host }}
 {{- end }}`)
 	if err != nil {
 		panic(err)
diff --git a/api/server/advisory/client_disconnect.go b/api/server/advisory/client_disconnect.go
index a917ecb4..4afda4f3 100644
--- a/api/server/advisory/client_disconnect.go
+++ b/api/server/advisory/client_disconnect.go
@@ -35,17 +35,17 @@ func init() {
 {{- end }}
 
    Client:
-            ID: {{ .Client.ID }}
+                 ID: {{ .Client.ID }}
 {{- if .Client.User }}
-          User: {{ .Client.User }}
+               User: {{ .Client.User }}
 {{- end }}
 {{- if .Client.Name }}
-          Name: {{ .Client.Name }}
+               Name: {{ .Client.Name }}
 {{- end }}
-       Account: {{ .Client.Account }}
-       Library Version: {{ .Client.Version }}  Language: {{ with .Client.Lang }}{{ . }}{{ else }}Unknown{{ end }}
+            Account: {{ .Client.Account }}
+    Library Version: {{ .Client.Version }}  Language: {{ with .Client.Lang }}{{ . }}{{ else }}Unknown{{ end }}
 {{- if .Client.Host }}
-          Host: {{ .Client.Host }}
+               Host: {{ .Client.Host }}
 {{- end }}
 
    Stats: