diff --git a/include/diaspora.php b/include/diaspora.php
index b5cb0f0e23..45feee87b5 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -2161,7 +2161,7 @@ function diaspora_profile($importer,$xml,$msg) {
 	$name = unxmlify($xml->first_name) . ((strlen($xml->last_name)) ? ' ' . unxmlify($xml->last_name) : '');
 	$image_url = unxmlify($xml->image_url);
 	$birthday = unxmlify($xml->birthday);
-	$location = unxmlify($xml->location);
+	$location = diaspora2bb(unxmlify($xml->location));
 	$about = diaspora2bb(unxmlify($xml->bio));
 
 
diff --git a/mod/display.php b/mod/display.php
index 3cc6761a4c..9735ba921f 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -94,7 +94,7 @@ function display_fetchauthor($a, $item) {
 		normalise_link($profiledata["url"]), $item["uid"]);
 	if (count($r)) {
 		$profiledata["photo"] = proxy_url($r[0]["photo"]);
-		$profiledata["address"] = $r[0]["location"];
+		$profiledata["address"] = bbcode($r[0]["location"]);
 		$profiledata["about"] = bbcode($r[0]["about"]);
 		if ($r[0]["nick"] != "")
 			$profiledata["nickname"] = $r[0]["nick"];