diff --git a/lib/pleroma/web/twitter_api/views/user_view.ex b/lib/pleroma/web/twitter_api/views/user_view.ex
index 30cf266bd..30aaaf1ce 100644
--- a/lib/pleroma/web/twitter_api/views/user_view.ex
+++ b/lib/pleroma/web/twitter_api/views/user_view.ex
@@ -50,6 +50,7 @@ def render("user.json", %{user: user = %User{}} = assigns) do
       "friends_count" => user_info[:following_count],
       "id" => user.id,
       "name" => user.name,
+      "name_html" => Formatter.emojify(user.name, emoji),
       "profile_image_url" => image,
       "profile_image_url_https" => image,
       "profile_image_url_profile_size" => image,
@@ -58,7 +59,6 @@ def render("user.json", %{user: user = %User{}} = assigns) do
         "delete_others_notice" => !!user.info["is_moderator"]
       },
       "screen_name" => user.nickname,
-      "screen_name_html" => Formatter.emojify(user.nickname, emoji),
       "statuses_count" => user_info[:note_count],
       "statusnet_profile_url" => user.ap_id,
       "cover_photo" => User.banner_url(user) |> MediaProxy.url(),
diff --git a/test/web/mastodon_api/account_view_test.exs b/test/web/mastodon_api/account_view_test.exs
index b93418b3f..8bf194e6b 100644
--- a/test/web/mastodon_api/account_view_test.exs
+++ b/test/web/mastodon_api/account_view_test.exs
@@ -5,10 +5,21 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
   alias Pleroma.User
 
   test "Represent a user account" do
+    source_data = %{
+      "tag" => [
+        %{
+          "type" => "Emoji",
+          "icon" => %{"url" => "/file.png"},
+          "name" => ":karjalanpiirakka:"
+        }
+      ]
+    }
+
     user =
       insert(:user, %{
-        info: %{"note_count" => 5, "follower_count" => 3},
+        info: %{"note_count" => 5, "follower_count" => 3, "source_data" => source_data},
         nickname: "shp@shitposter.club",
+        name: ":karjalanpiirakka: shp",
         inserted_at: ~N[2017-08-15 15:47:06.597036]
       })
 
@@ -28,7 +39,14 @@ test "Represent a user account" do
       avatar_static: "http://localhost:4001/images/avi.png",
       header: "http://localhost:4001/images/banner.png",
       header_static: "http://localhost:4001/images/banner.png",
-      emojis: [],
+      emojis: [
+        %{
+          "static_url" => "/file.png",
+          "url" => "/file.png",
+          "shortcode" => "karjalanpiirakka",
+          "visible_in_picker" => false
+        }
+      ],
       fields: [],
       source: %{
         note: "",
diff --git a/test/web/twitter_api/views/user_view_test.exs b/test/web/twitter_api/views/user_view_test.exs
index 000c589af..fefb6bdcc 100644
--- a/test/web/twitter_api/views/user_view_test.exs
+++ b/test/web/twitter_api/views/user_view_test.exs
@@ -20,6 +20,30 @@ test "A user with an avatar object", %{user: user} do
     assert represented["profile_image_url"] == image
   end
 
+  test "A user with emoji in username", %{user: user} do
+    expected =
+      "<img height='32px' width='32px' alt='karjalanpiirakka' title='karjalanpiirakka' src='/file.png' /> man"
+
+    user = %{
+      user
+      | info: %{
+          "source_data" => %{
+            "tag" => [
+              %{
+                "type" => "Emoji",
+                "icon" => %{"url" => "/file.png"},
+                "name" => ":karjalanpiirakka:"
+              }
+            ]
+          }
+        }
+    }
+
+    user = %{user | name: ":karjalanpiirakka: man"}
+    represented = UserView.render("show.json", %{user: user})
+    assert represented["name_html"] == expected
+  end
+
   test "A user" do
     note_activity = insert(:note_activity)
     user = User.get_cached_by_ap_id(note_activity.data["actor"])
@@ -40,7 +64,7 @@ test "A user" do
       "id" => user.id,
       "name" => user.name,
       "screen_name" => user.nickname,
-      "screen_name_html" => user.nickname,
+      "name_html" => user.name,
       "description" => HtmlSanitizeEx.strip_tags(user.bio),
       "description_html" => HtmlSanitizeEx.strip_tags(user.bio),
       "created_at" => user.inserted_at |> Utils.format_naive_asctime(),
@@ -79,7 +103,7 @@ test "A user for a given other follower", %{user: user} do
       "id" => user.id,
       "name" => user.name,
       "screen_name" => user.nickname,
-      "screen_name_html" => user.nickname,
+      "name_html" => user.name,
       "description" => HtmlSanitizeEx.strip_tags(user.bio),
       "description_html" => HtmlSanitizeEx.strip_tags(user.bio),
       "created_at" => user.inserted_at |> Utils.format_naive_asctime(),
@@ -119,7 +143,7 @@ test "A user that follows you", %{user: user} do
       "id" => follower.id,
       "name" => follower.name,
       "screen_name" => follower.nickname,
-      "screen_name_html" => follower.nickname,
+      "name_html" => follower.name,
       "description" => HtmlSanitizeEx.strip_tags(follower.bio),
       "description_html" => HtmlSanitizeEx.strip_tags(follower.bio),
       "created_at" => follower.inserted_at |> Utils.format_naive_asctime(),
@@ -166,7 +190,7 @@ test "A blocked user for the blocker" do
       "id" => user.id,
       "name" => user.name,
       "screen_name" => user.nickname,
-      "screen_name_html" => user.nickname,
+      "name_html" => user.name,
       "description" => HtmlSanitizeEx.strip_tags(user.bio),
       "description_html" => HtmlSanitizeEx.strip_tags(user.bio),
       "created_at" => user.inserted_at |> Utils.format_naive_asctime(),