diff --git a/forumdirectory/templates/forumdirectory_item.tpl b/forumdirectory/templates/forumdirectory_item.tpl
index ee38c28a..5b6a946a 100644
--- a/forumdirectory/templates/forumdirectory_item.tpl
+++ b/forumdirectory/templates/forumdirectory_item.tpl
@@ -18,9 +18,9 @@
 				<dd class="adr">
 					{{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
 					<span class="city-state-zip">
-						<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-						<span class="region">{{$profile.region}}</span>
-						<span class="postal-code">{{$profile.postal-code}}</span>
+						{{if $profile.locality}}<span class="locality">{{$profile.locality}}</span>, {{/if}}
+						{{if $profile.region}}<span class="region">{{$profile.region}}</span>{{/if}}
+						{{if $profile.postal-code}}<span class="postal-code">{{$profile.postal-code}}</span>{{/if}}
 					</span>
 					{{if $profile.country-name}}<span class="country-name">{{$profile.country-name}}</span>{{/if}}
 				</dd>