diff --git a/include/bbcode.php b/include/bbcode.php
index cea1dbdccc..84969dab9f 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -488,10 +488,10 @@ function bb_ShareAttributes($share, $simplehtml) {
 			$text = $preshare."&gt;&gt; @".$userid_compact.": <br />".$share[3];
 			break;
 		case 7:
-			$text = $preshare.html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8')." @".$userid_compact." ".$share[3];
+			$text = $preshare.html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8')." @".$userid_compact.": ".$share[3];
 			break;
 		case 8:
-			$text = $preshare."RT @".$userid_compact." ".$share[3];
+			$text = $preshare."RT @".$userid_compact.": ".$share[3];
 			break;
 		default:
 			$headline = trim($share[1]).'<div class="shared_header">';
@@ -525,8 +525,12 @@ function GetProfileUsername($profile, $username, $compact = false) {
 	}
 
 	$gplus = preg_replace("=https?://plus.google.com/(.*)=ism", "$1@plus.google.com", $profile);
-	if ($gplus != $profile)
-		return($username." (".$gplus.")");
+	if ($gplus != $profile) {
+		if ($compact)
+			return($gplususername." (".$username.")");
+		else
+			return($username." (".$gplus.")");
+	}
 
 	$friendica = preg_replace("=https?://(.*)/profile/(.*)=ism", "$2@$1", $profile);
 	if ($friendica != $profile) {