diff --git a/src/hlr.c b/src/hlr.c
index 4fc072f..f60b24b 100644
--- a/src/hlr.c
+++ b/src/hlr.c
@@ -47,7 +47,6 @@
 
 	/* initialize return message structure */
 	memset(&gsup_out, 0, sizeof(gsup_out));
-	gsup_out.message_type = OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT;
 	memcpy(&gsup_out.imsi, &gsup->imsi, sizeof(gsup_out.imsi));
 
 	rc = db_get_auc(g_dbc, gsup->imsi, gsup_out.auth_vectors,
@@ -59,6 +58,9 @@
 	} else if (rc == 0) {
 		gsup_out.message_type = OSMO_GSUP_MSGT_SEND_AUTH_INFO_ERROR;
 		gsup_out.cause = GMM_CAUSE_IMSI_UNKNOWN;
+	} else {
+		gsup_out.message_type = OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT;
+		gsup_out.num_auth_vectors = rc;
 	}
 
 	msg_out = msgb_alloc_headroom(1024+16, 16, "GSUP AUC response");