1 files changed, 4 insertions, 0 deletions
diff --git a/server.c b/server.c
index 0780e6b1..3bb93d95 100644
--- a/server.c
+++ b/server.c
@@ -632,6 +632,9 @@ server_check_timers(struct client *c)
 	if (gettimeofday(&tv, NULL) != 0)
 		fatal("gettimeofday");
 
+	if (c->flags & CLIENT_IDENTIFY && timercmp(&tv, &c->identify_timer, >))
+		server_clear_identify(c);
+
 	if (c->message_string != NULL && timercmp(&tv, &c->message_timer, >))
 		status_message_clear(c);
 
@@ -809,6 +812,7 @@ server_handle_client(struct client *c)
 		wp = c->session->curw->window->active;	/* could die */
 
 		status_message_clear(c);
+		server_clear_identify(c);
 		if (c->prompt_string != NULL) {
 			status_prompt_key(c, key);
 			continue;