diff --git a/usr.sbin/ctld/login.c b/usr.sbin/ctld/login.c
--- a/usr.sbin/ctld/login.c
+++ b/usr.sbin/ctld/login.c
@@ -565,10 +565,6 @@
 			tmp = conn->conn_max_send_data_segment_limit;
 		}
 		conn->conn_max_send_data_segment_length = tmp;
-		conn->conn_max_recv_data_segment_length =
-		    conn->conn_max_recv_data_segment_limit;
-		keys_add_int(response_keys, name,
-		    conn->conn_max_recv_data_segment_length);
 	} else if (strcmp(name, "MaxBurstLength") == 0) {
 		tmp = strtoul(value, NULL, 10);
 		if (tmp <= 0) {
@@ -796,6 +792,11 @@
 		log_errx(1, "initiator sent FirstBurstLength > MaxBurstLength");
 	}
 
+	conn->conn_max_recv_data_segment_length =
+	    conn->conn_max_recv_data_segment_limit;
+	keys_add_int(response_keys, "MaxRecvDataSegmentLength",
+		    conn->conn_max_recv_data_segment_length);
+
 	log_debugx("operational parameter negotiation done; "
 	    "transitioning to Full Feature Phase");