diff --git a/td/telegram/Usernames.cpp b/td/telegram/Usernames.cpp
index e7bf50ee3..eb8cf45c0 100644
--- a/td/telegram/Usernames.cpp
+++ b/td/telegram/Usernames.cpp
@@ -71,9 +71,14 @@ tl_object_ptr<td_api::usernames> Usernames::get_usernames_object() const {
 Usernames Usernames::change_editable_username(string &&new_username) const {
   Usernames result = *this;
   if (has_editable_username()) {
-    // keep position
-    result.active_usernames_[editable_username_pos_] = std::move(new_username);
-  } else {
+    if (new_username.empty()) {
+      result.active_usernames_.erase(result.active_usernames_.begin() + editable_username_pos_);
+      result.editable_username_pos_ = -1;
+    } else {
+      // keep position
+      result.active_usernames_[editable_username_pos_] = std::move(new_username);
+    }
+  } else if (!new_username.empty()) {
     // add to the beginning
     result.active_usernames_.insert(result.active_usernames_.begin(), std::move(new_username));
     result.editable_username_pos_ = 0;
diff --git a/td/telegram/cli.cpp b/td/telegram/cli.cpp
index 1ef6b1f65..7084d7ad7 100644
--- a/td/telegram/cli.cpp
+++ b/td/telegram/cli.cpp
@@ -4569,7 +4569,7 @@ class CliClient final : public Actor {
       send_request(td_api::make_object<td_api::disableAllSupergroupUsernames>(as_supergroup_id(supergroup_id)));
     } else if (op == "rsgaun" || op == "rchaun") {
       string supergroup_id;
-      get_args(args, supergroup_id);
+      get_args(args, supergroup_id, args);
       send_request(td_api::make_object<td_api::reorderSupergroupActiveUsernames>(as_supergroup_id(supergroup_id),
                                                                                  autosplit_str(args)));
     } else if (op == "ssgss") {