diff --git a/include/Probe.php b/include/Probe.php
index 8b6039a6f6..9dc2a370b9 100644
--- a/include/Probe.php
+++ b/include/Probe.php
@@ -5,11 +5,9 @@
  * To-Do:
  *
  * - OStatus links with index.php
+ * - OStatus alias link
  * - Non absolute URL in feeds?
- * - Check for tumblr feed?
- * - more logging?
  * - Workaround for misconfigured Friendica servers?
- * - Check if Hubzilla servers with OStatus are detected correctly
  *
  */
 
@@ -135,9 +133,13 @@ class Probe {
 		if (!isset($data["name"]))
 			$data["name"] = $data["url"];
 
-		if (!isset($data["nick"]))
+		if (!isset($data["nick"])) {
 			$data["nick"] = strtolower($data["name"]);
 
+			if (strpos($data['nick'], ' '))
+				$data['nick'] = trim(substr($data['nick'], 0, strpos($data['nick'], ' ')));
+		}
+
 		if (!isset($data["network"]))
 			$data["network"] = NETWORK_PHANTOM;