diff --git a/lib/pleroma/web/ostatus/ostatus.ex b/lib/pleroma/web/ostatus/ostatus.ex
index 3e239179e..59c5d8e9e 100644
--- a/lib/pleroma/web/ostatus/ostatus.ex
+++ b/lib/pleroma/web/ostatus/ostatus.ex
@@ -96,10 +96,12 @@ def make_user(uri) do
       data = %{
         local: false,
         name: info.name,
-        nickname: info.nickname,
+        nickname: info.nickname <> "@" <> info.host,
         ap_id: info.uri,
         info: info
       }
+      # TODO: Make remote user changeset
+      # SHould enforce fqn nickname
       Repo.insert(Ecto.Changeset.change(%User{}, data))
     end
   end
diff --git a/lib/pleroma/web/websub/websub.ex b/lib/pleroma/web/websub/websub.ex
index 8e3e0a54e..3fd779fba 100644
--- a/lib/pleroma/web/websub/websub.ex
+++ b/lib/pleroma/web/websub/websub.ex
@@ -139,7 +139,8 @@ def gather_feed_data(topic, getter \\ &HTTPoison.get/1) do
         uri: uri,
         hub: hub,
         nickname: preferredUsername || name,
-        name: displayName || name
+        name: displayName || name,
+        host: URI.parse(uri).host
       }}
     else e ->
       {:error, e}
diff --git a/test/web/ostatus/ostatus_test.exs b/test/web/ostatus/ostatus_test.exs
index 4f396d940..cc0975bb5 100644
--- a/test/web/ostatus/ostatus_test.exs
+++ b/test/web/ostatus/ostatus_test.exs
@@ -33,7 +33,7 @@ test "tries to use the information in poco fields" do
 
       user = Repo.get(Pleroma.User, user.id)
       assert user.name == "Constance Variable"
-      assert user.nickname == "lambadalambda"
+      assert user.nickname == "lambadalambda@social.heldscal.la"
       assert user.local == false
       assert user.info["uri"] == uri
       assert user.ap_id == uri
@@ -60,6 +60,7 @@ test "it returns user info in a hash" do
         subject: "acct:shp@social.heldscal.la",
         topic: "https://social.heldscal.la/api/statuses/user_timeline/29191.atom",
         uri: "https://social.heldscal.la/user/29191",
+        host: "social.heldscal.la",
         fqn: user
       }
       assert data == expected
@@ -80,6 +81,7 @@ test "it works with the uri" do
         subject: "https://social.heldscal.la/user/29191",
         topic: "https://social.heldscal.la/api/statuses/user_timeline/29191.atom",
         uri: "https://social.heldscal.la/user/29191",
+        host: "social.heldscal.la",
         fqn: user
       }
       assert data == expected
diff --git a/test/web/websub/websub_test.exs b/test/web/websub/websub_test.exs
index 25c2b8baa..e0d71e16d 100644
--- a/test/web/websub/websub_test.exs
+++ b/test/web/websub/websub_test.exs
@@ -118,7 +118,8 @@ test "discovers the hub and canonical url" do
       hub: "https://mastodon.social/api/push",
       uri: "https://mastodon.social/users/lambadalambda",
       nickname: "lambadalambda",
-      name: "Critical Value"
+      name: "Critical Value",
+      host: "mastodon.social"
     }
 
     assert expected == discovered