diff --git a/src/charselect.cpp b/src/charselect.cpp
index 510d8c0..d35f0ca 100644
--- a/src/charselect.cpp
+++ b/src/charselect.cpp
@@ -168,14 +168,14 @@ void Courtroom::char_clicked(int n_char)
     }
   }
 
-  if (n_char != m_cid) {
+  if (n_char != m_cid || n_char == -1) {
     ao_app->send_server_packet(
         new AOPacket("PW#" + ui_char_password->text() + "#%"));
     ao_app->send_server_packet(
         new AOPacket("CC#" + QString::number(ao_app->s_pv) + "#" +
                      QString::number(n_char) + "#" + get_hdid() + "#%"));
   }
-  else {
+  if (n_char == m_cid || n_char == -1) {
     update_character(n_char);
     enter_courtroom();
     set_courtroom_size();