diff --git a/apps/files_sharing/settings-personal.php b/apps/files_sharing/settings-personal.php
index 704ee8103db55527d909b31f550c0c53219d402e..fdf641e1d2c877b8b0724dd5837fedf0c9e1e682 100644
--- a/apps/files_sharing/settings-personal.php
+++ b/apps/files_sharing/settings-personal.php
@@ -27,13 +27,13 @@ $l = \OC::$server->getL10N('files_sharing');
 $uid = \OC::$server->getUserSession()->getUser()->getUID();
 $server = \OC::$server->getURLGenerator()->getAbsoluteURL('/');
 $cloudID = $uid . '@' . rtrim(\OCA\Files_Sharing\Helper::removeProtocolFromUrl($server), '/');
-$url = 'https://owncloud.org/federation';
+$url = 'https://owncloud.org/federation#' . $cloudID;
 $ownCloudLogoPath = \OC::$server->getURLGenerator()->imagePath('core', 'logo-icon.svg');
 
 $tmpl = new OCP\Template('files_sharing', 'settings-personal');
 $tmpl->assign('outgoingServer2serverShareEnabled', \OCA\Files_Sharing\Helper::isOutgoingServer2serverShareEnabled());
-$tmpl->assign('message_with_URL', $l->t('Share with me through my #ownCloud Federated Cloud ID %s see %s', [$cloudID, $url]));
-$tmpl->assign('message_without_URL', $l->t('Share with me through my #ownCloud Federated Cloud ID %s', [$cloudID]));
+$tmpl->assign('message_with_URL', $l->t('Share with me through my #ownCloud Federated Cloud ID, see %s', [$url]));
+$tmpl->assign('message_without_URL', $l->t('Share with me through my #ownCloud Federated Cloud ID', [$cloudID]));
 $tmpl->assign('owncloud_logo_path', $ownCloudLogoPath);
 $tmpl->assign('reference', $url);
 $tmpl->assign('cloudId', $cloudID);
diff --git a/apps/files_sharing/templates/settings-personal.php b/apps/files_sharing/templates/settings-personal.php
index bc10da5583b1bde0b63c5bc0744bbe044af3fd8f..ee761ff5897d96641bff2f96b05bfcd2c067d7f6 100644
--- a/apps/files_sharing/templates/settings-personal.php
+++ b/apps/files_sharing/templates/settings-personal.php
@@ -21,14 +21,14 @@ style('files_sharing', '3rdparty/gs-share/style');
 		<p>
 			<?php p($l->t('Share it:')); ?>
 			<div class="gs-share">
-			<button data-url="<?php p($_['reference']); ?>"
+			<button data-url="<?php p(urlencode($_['reference'])); ?>"
 				data-title='<?php p(urlencode($_['message_without_URL'])); ?>'
 				class='js-gs-share social-gnu'>
 				GNU Social
 			</button>
 			</div>
 			<button class="social-diaspora pop-up"
-				data-url='http://sharetodiaspora.github.io/?title=<?php p($_['message_without_URL']); ?>&url=<?php p($_['reference']); ?>'>
+				data-url='http://sharetodiaspora.github.io/?title=<?php p($_['message_without_URL']); ?>&url=<?php p(urlencode($_['reference'])); ?>'>
 				Diaspora
 			</button>
 			<button class="social-twitter pop-up"
@@ -36,11 +36,11 @@ style('files_sharing', '3rdparty/gs-share/style');
 				Twitter
 			</button>
 			<button class="social-facebook pop-up"
-				data-url='https://www.facebook.com/sharer/sharer.php?u=<?php p($_['reference']); ?>'>
+				data-url='https://www.facebook.com/sharer/sharer.php?u=<?php p(urlencode($_['reference'])); ?>'>
 				Facebook
 			</button>
 			<button class="social-googleplus pop-up"
-				data-url='https://plus.google.com/share?url=<?php p($_['reference']); ?>'/>
+				data-url='https://plus.google.com/share?url=<?php p(urlencode($_['reference'])); ?>'/>
 				Google+
 			</button>
 		</p>