1 files changed, 3 insertions, 0 deletions
diff --git a/src/chanserv.c b/src/chanserv.c
index feda36356..a4edae96e 100644
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -2729,6 +2729,9 @@ static int do_register(User * u)
             ci->last_topic = sstrdup(c->topic);
             strscpy(ci->last_topic_setter, c->topic_setter, NICKMAX);
             ci->last_topic_time = c->topic_time;
+        } else {
+            /* Set this to something, otherwise it will maliform the topic */
+            strscpy(ci->last_topic_setter, s_ChanServ, NICKMAX);
         }
         ci->bi = NULL;
         ci->botflags = BSDefFlags;