diff --git a/view/templates/profile/vcard.tpl b/view/templates/profile/vcard.tpl
index 521738107..32f7e0fcf 100644
--- a/view/templates/profile/vcard.tpl
+++ b/view/templates/profile/vcard.tpl
@@ -1,12 +1,10 @@
-
{{$profile.name}}
+
{{$profile.name}}
{{if $profile.addr}}
{{$profile.addr}}
{{/if}}
- {{if $profile.about}}
{{$profile.about nofilter}}
{{/if}}
-
{{if $profile.picdate}}
{{else}}
diff --git a/view/theme/duepuntozero/templates/profile/vcard.tpl b/view/theme/duepuntozero/templates/profile/vcard.tpl
index 983d8faa5..1ea91f197 100644
--- a/view/theme/duepuntozero/templates/profile/vcard.tpl
+++ b/view/theme/duepuntozero/templates/profile/vcard.tpl
@@ -1,11 +1,10 @@
-
{{$profile.name}}
+
{{$profile.name}}
{{if $profile.addr}}
{{$profile.addr}}
{{/if}}
- {{if $profile.about}}
{{$profile.about nofilter}}
{{/if}}
{{if $account_type}}
{{$account_type}}
{{/if}}
@@ -26,6 +25,8 @@
{{/if}}
+ {{if $profile.about}}
{{$profile.about nofilter}}
{{/if}}
+
{{if $profile.pubkey}}
{{$profile.pubkey}}
{{/if}}
{{if $homepage}}
- {{$homepage}}
- {{$profile.homepage}}
{{/if}}
diff --git a/view/theme/quattro/templates/profile/vcard.tpl b/view/theme/quattro/templates/profile/vcard.tpl
index 605574bf8..3bbb9e09f 100644
--- a/view/theme/quattro/templates/profile/vcard.tpl
+++ b/view/theme/quattro/templates/profile/vcard.tpl
@@ -1,7 +1,7 @@