diff --git a/src/Model/Term.php b/src/Model/Term.php
index 6042091c9..854861ccb 100644
--- a/src/Model/Term.php
+++ b/src/Model/Term.php
@@ -110,6 +110,18 @@ class Term
 		$pattern = '/\W([\#@])\[url\=(.*?)\](.*?)\[\/url\]/ism';
 		if (preg_match_all($pattern, $data, $matches, PREG_SET_ORDER)) {
 			foreach ($matches as $match) {
+
+				if ($match[1] == '@') {
+					$contact = Contact::getDetailsByURL($match[2], 0);
+					if (!empty($contact['addr'])) {
+						$match[3] = $contact['addr'];
+					}
+
+					if (!empty($contact['url'])) {
+						$match[2] = $contact['url'];
+					}
+				}
+
 				$tags[$match[1] . trim($match[3], ',.:;[]/\"?!')] = $match[2];
 			}
 		}
@@ -137,10 +149,6 @@ class Term
 				} else {
 					$term = substr($tag, 1);
 				}
-
-				if (!empty($contact['url'])) {
-					$link = $contact['url'];
-				}
 			} else { // This shouldn't happen
 				$type = TERM_HASHTAG;
 				$term = $tag;