diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index a0d36d03a..4e46e80ea 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -273,6 +273,12 @@ def make_user_from_ap_id(ap_id) do
       }
 
       User.insert_or_update_user(user_data)
+      if user = User.get_by_ap_id(ap_id) do
+        User.info_changeset(user, user_data}
+        |> Repo.update
+      else
+        User.insert_or_update_user(user_data)
+      end
     end
   end