diff --git a/results-domain/results-domain-aggregate/src/main/java/uk/gov/moj/cpp/results/domain/aggregate/MarkedAggregateSendEmailEventBuilder.java b/results-domain/results-domain-aggregate/src/main/java/uk/gov/moj/cpp/results/domain/aggregate/MarkedAggregateSendEmailEventBuilder.java index a7cac3120..a9e2f2e24 100644 --- a/results-domain/results-domain-aggregate/src/main/java/uk/gov/moj/cpp/results/domain/aggregate/MarkedAggregateSendEmailEventBuilder.java +++ b/results-domain/results-domain-aggregate/src/main/java/uk/gov/moj/cpp/results/domain/aggregate/MarkedAggregateSendEmailEventBuilder.java @@ -271,6 +271,11 @@ public MarkedAggregateSendEmailWhenAccountReceived buildMarkedAggregateWithOlds( if (isNotEmpty(correlationsWrapper.getOldAccountDetails())) { builder.withOldAccountDetails(correlationsWrapper.getOldAccountDetails()); + correlationItemList.stream() + .filter(ci -> hearingFinancialResultRequest.getAccountCorrelationId() != null + && hearingFinancialResultRequest.getAccountCorrelationId().equals(ci.getAccountCorrelationId())) + .findFirst() + .ifPresent(ci -> builder.withGobAccountNumber(ci.getAccountNumber())); } if (AMEND_AND_RESHARE.equals(subject)) {