diff --git a/src/auth/auth-request.c b/src/auth/auth-request.c
index 59dbb528a1..e78d6eb840 100644
--- a/src/auth/auth-request.c
+++ b/src/auth/auth-request.c
@@ -415,9 +415,10 @@ bool auth_request_import_info(struct auth_request *request,
 		request->local_name = p_strdup(request->pool, value);
 	else if (strcmp(key, "session") == 0)
 		request->session_id = p_strdup(request->pool, value);
-	else if (strcmp(key, "debug") == 0)
+	else if (strcmp(key, "debug") == 0) {
 		request->debug = TRUE;
-	else if (strcmp(key, "client_id") == 0)
+		event_set_forced_debug(request->event, TRUE);
+	} else if (strcmp(key, "client_id") == 0)
 		request->client_id = p_strdup(request->pool, value);
 	else if (strcmp(key, "forward_fields") == 0) {
 		auth_fields_import_prefixed(request->extra_fields,