diff --git a/telegram-bot-api/Client.cpp b/telegram-bot-api/Client.cpp
index 99b5ac85c..774320bbb 100644
--- a/telegram-bot-api/Client.cpp
+++ b/telegram-bot-api/Client.cpp
@@ -3670,7 +3670,11 @@ std::size_t Client::get_pending_update_count() const {
 
 ServerBotInfo Client::get_bot_info() const {
   ServerBotInfo res;
-  res.id_ = bot_token_id_;
+  if (is_user_) {
+    res.id_ = td::to_string(my_id_);
+  } else {
+    res.id_ = bot_token_id_;
+  }
   res.token_ = bot_token_;
   auto user_info = get_user_info(my_id_);
   if (user_info != nullptr) {
@@ -6571,7 +6575,7 @@ void Client::on_cmd(PromisedQueryPtr query) {
     } else if (query->method() == "registeruser" && parameters_->allow_users_registration_) {
       return process_register_user_query(query);
     } else {
-      return fail_query(404, "Not Found: method not found", std::move(query));
+      return fail_query(404, "Not Found: method not found or login not yet completed", std::move(query));
     }
   }
 
diff --git a/telegram-bot-api/HttpConnection.cpp b/telegram-bot-api/HttpConnection.cpp
index 8a3aac143..ab47f5b39 100644
--- a/telegram-bot-api/HttpConnection.cpp
+++ b/telegram-bot-api/HttpConnection.cpp
@@ -31,7 +31,7 @@ void HttpConnection::handle(td::unique_ptr<td::HttpQuery> http_query,
   bool is_login = false;
   bool is_user = false;
   if (url_path_parser.try_skip("/bot")) {
-  } else if (url_path_parser.try_skip("/userlogin")) {
+  } else if (url_path_parser.try_skip("/userlogin") || url_path_parser.try_skip("/userLogin")) {
     is_user = true;
     is_login = true;
   } else if (url_path_parser.try_skip("/user")) {