diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index 8267674e5..887e35b72 100644
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -512,10 +512,8 @@ class Profile
 			$p['about'] = BBCode::convert($p['about']);
 		}
 
-		if (isset($p['address'])) {
-			$p['address'] = BBCode::convert($p['address']);
-		} elseif (isset($p['location'])) {
-			$p['address'] = BBCode::convert($p['location']);
+		if (empty($p['address']) && !empty($p['location'])) {
+			$p['address'] = $p['location'];
 		}
 
 		if (isset($p['photo'])) {
diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index fa88c0ea0..c030f60f4 100644
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -643,7 +643,7 @@ class Contact extends BaseModule
 				'$profileurllabel'=> L10n::t('Profile URL'),
 				'$profileurl'     => $contact['url'],
 				'$account_type'   => Model\Contact::getAccountType($contact),
-				'$location'       => BBCode::convert($contact['location']),
+				'$location'       => $contact['location'],
 				'$location_label' => L10n::t('Location:'),
 				'$xmpp'           => BBCode::convert($contact['xmpp']),
 				'$xmpp_label'     => L10n::t('XMPP:'),