diff --git a/layouts/shortcodes/indieweb-person.html b/layouts/shortcodes/indieweb-person.html
index a2497e7..07373c9 100644
--- a/layouts/shortcodes/indieweb-person.html
+++ b/layouts/shortcodes/indieweb-person.html
@@ -9,8 +9,8 @@
 		<span itemprop="name" class="p-name fn n">
 			{{- if (.Get "first-name") -}}<span itemprop="givenName" class="p-given-name given-name">{{- .Get "first-name" -}}</span>{{- end }}
 			{{ if (.Get "last-name") -}}<span itemprop="familyName" class="p-family-name family-name">{{- .Get "last-name" -}}</span>{{- end -}}
-			{{- if (.Get "nickname") -}}<span itemprop="nickname" class="p-nickname nickname">{{- .Get "nickname" -}}</span>{{- end -}}
-			{{- if (.Get "name") -}}{{- .Get "name" -}}{{- end -}}
+			{{- if (.Get "nickname") -}}<span itemprop="name nickname" class="p-nickname nickname">{{- .Get "nickname" -}}</span>
+			{{- else if (.Get "name") -}}{{- .Get "name" -}}{{- end -}}
 		</span>{{- if (.Get "appendString") -}}{{- .Get "appendString" -}}{{- end -}}{{- /* Strip trailing newline: https://github.com/gohugoio/hugo/issues/1753 */ -}}
 	</a>{{- /* Strip trailing newline: https://github.com/gohugoio/hugo/issues/1753 */ -}}
 	{{- if (.Get "org") }}