diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl
index 99ec8b5b..0dd13d60 100644
--- a/td/generate/scheme/td_api.tl
+++ b/td/generate/scheme/td_api.tl
@@ -4076,7 +4076,7 @@ deleteAccount reason:string = Ok;
 //@description Removes a chat action bar without any other action @chat_id Chat identifier
 removeChatActionBar chat_id:int53 = Ok;
 
-//@description Reports a chat to the Telegram moderators. Supported only for supergroups, channels, or private chats with bots, since other chats can't be checked by moderators, or when the report is done from the chat action bar @chat_id Chat identifier @reason The reason for reporting the chat @message_ids Identifiers of reported messages, if any
+//@description Reports a chat to the Telegram moderators. A chat can be reported only from the chat action bar, or if this is a private chats with a bot, a private chat with a user sharing their location, a supergroup, or a channel, since other chats can't be checked by moderators @chat_id Chat identifier @reason The reason for reporting the chat @message_ids Identifiers of reported messages, if any
 reportChat chat_id:int53 reason:ChatReportReason message_ids:vector<int53> = Ok;
 
 
diff --git a/td/telegram/ContactsManager.cpp b/td/telegram/ContactsManager.cpp
index 8e2c9cc8..71dbfd96 100644
--- a/td/telegram/ContactsManager.cpp
+++ b/td/telegram/ContactsManager.cpp
@@ -4928,6 +4928,7 @@ void ContactsManager::on_update_peer_located(vector<tl_object_ptr<telegram_api::
     td_->messages_manager_->force_create_dialog(dialog_id, "on_update_peer_located");
 
     if (from_update) {
+      CHECK(dialog_type == DialogType::User);
       bool is_found = false;
       for (auto &dialog_nearby : users_nearby_) {
         if (dialog_nearby.dialog_id == dialog_id) {
@@ -4941,11 +4942,16 @@ void ContactsManager::on_update_peer_located(vector<tl_object_ptr<telegram_api::
       }
       if (!is_found) {
         users_nearby_.emplace_back(dialog_id, distance);
+        all_users_nearby_.insert(dialog_id.get_user_id());
         need_update = true;
       }
     } else {
-      auto &dialogs_nearby = dialog_type == DialogType::User ? users_nearby_ : channels_nearby_;
-      dialogs_nearby.emplace_back(dialog_id, distance);
+      if (dialog_type == DialogType::User) {
+        users_nearby_.emplace_back(dialog_id, distance);
+        all_users_nearby_.insert(dialog_id.get_user_id());
+      } else {
+        channels_nearby_.emplace_back(dialog_id, distance);
+      }
     }
   }
   if (need_update) {
@@ -10966,7 +10972,7 @@ bool ContactsManager::is_user_status_exact(UserId user_id) const {
 
 bool ContactsManager::can_report_user(UserId user_id) const {
   auto u = get_user(user_id);
-  return u != nullptr && !u->is_deleted && u->is_bot && !u->is_support;
+  return u != nullptr && !u->is_deleted && !u->is_support && (u->is_bot || all_users_nearby_.count(user_id) != 0);
 }
 
 const ContactsManager::User *ContactsManager::get_user(UserId user_id) const {
diff --git a/td/telegram/ContactsManager.h b/td/telegram/ContactsManager.h
index d91844db..a6e08fff 100644
--- a/td/telegram/ContactsManager.h
+++ b/td/telegram/ContactsManager.h
@@ -1425,6 +1425,7 @@ class ContactsManager : public Actor {
 
   vector<DialogNearby> users_nearby_;
   vector<DialogNearby> channels_nearby_;
+  std::unordered_set<UserId, UserIdHash> all_users_nearby_;
 
   std::unordered_map<ChannelId, ChannelId, ChannelIdHash> linked_channel_ids_;
 
diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 9a53fab1..d43de6af 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -6942,7 +6942,7 @@ void MessagesManager::report_dialog(DialogId dialog_id, const tl_object_ptr<td_a
   }
 
   if (reason == nullptr) {
-    return promise.set_error(Status::Error(3, "Reason shouldn't be empty"));
+    return promise.set_error(Status::Error(3, "Reason must not be empty"));
   }
 
   Dialog *user_d = d;
diff --git a/td/telegram/StickersManager.cpp b/td/telegram/StickersManager.cpp
index 843ac9f7..78095f88 100644
--- a/td/telegram/StickersManager.cpp
+++ b/td/telegram/StickersManager.cpp
@@ -3509,7 +3509,7 @@ void StickersManager::reorder_installed_sticker_sets(bool is_masks, const vector
 
 Result<std::tuple<FileId, bool, bool>> StickersManager::prepare_input_sticker(td_api::inputSticker *sticker) {
   if (sticker == nullptr) {
-    return Status::Error(3, "Input sticker shouldn't be empty");
+    return Status::Error(3, "Input sticker must not be empty");
   }
 
   if (!clean_input_string(sticker->emojis_)) {