diff --git a/Apps/W1/ContosoCoffeeDemoDataset/app/DemoData/Finance/2.Master data/CreateAddReportingCurrency.Codeunit.al b/Apps/W1/ContosoCoffeeDemoDataset/app/DemoData/Finance/2.Master data/CreateAddReportingCurrency.Codeunit.al
new file mode 100644
index 0000000000..b775dff3e4
--- /dev/null
+++ b/Apps/W1/ContosoCoffeeDemoDataset/app/DemoData/Finance/2.Master data/CreateAddReportingCurrency.Codeunit.al	
@@ -0,0 +1,52 @@
+// ------------------------------------------------------------------------------------------------
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// ------------------------------------------------------------------------------------------------
+
+namespace Microsoft.DemoData.Finance;
+
+using Microsoft.Finance.Currency;
+using Microsoft.Finance.GeneralLedger.Setup;
+
+codeunit 5627 "Create Add. Reporting Currency"
+{
+    InherentEntitlements = X;
+    InherentPermissions = X;
+    Permissions =
+        tabledata "General Ledger Setup" = rm,
+        tabledata Currency = rm;
+
+    trigger OnRun()
+    begin
+        ConfigureAdditionalReportingCurrency();
+        UpdateCurrencyResidualAccounts();
+    end;
+
+    procedure ConfigureAdditionalReportingCurrency()
+    var
+        GeneralLedgerSetup: Record "General Ledger Setup";
+        CreateCurrency: Codeunit "Create Currency";
+        ACYCode: Code[10];
+    begin
+        GeneralLedgerSetup.Get();
+        ACYCode := GeneralLedgerSetup."LCY Code" = CreateCurrency.EUR() ? CreateCurrency.USD() : CreateCurrency.EUR();
+        GeneralLedgerSetup."Additional Reporting Currency" := ACYCode;
+        GeneralLedgerSetup.Modify(true);
+    end;
+
+    procedure UpdateCurrencyResidualAccounts()
+    var
+        Currency: Record "Currency";
+        CreateCurrency: Codeunit "Create Currency";
+        CreateGLAccount: Codeunit "Create G/L Account";
+    begin
+        Currency.SetFilter(Code, '%1|%2', CreateCurrency.EUR(), CreateCurrency.USD());
+        if Currency.FindSet(true) then begin
+            repeat
+                Currency.Validate("Residual Gains Account", CreateGLAccount.RealizedFXGains());
+                Currency.Validate("Residual Losses Account", CreateGLAccount.RealizedFXLosses());
+                Currency.Modify(true);
+            until Currency.Next() = 0;
+        end;
+    end;
+}
\ No newline at end of file
diff --git a/Apps/W1/ContosoCoffeeDemoDataset/app/DemoData/Finance/FinanceModule.Codeunit.al b/Apps/W1/ContosoCoffeeDemoDataset/app/DemoData/Finance/FinanceModule.Codeunit.al
index 823c747c0a..84eaae8f8e 100644
--- a/Apps/W1/ContosoCoffeeDemoDataset/app/DemoData/Finance/FinanceModule.Codeunit.al
+++ b/Apps/W1/ContosoCoffeeDemoDataset/app/DemoData/Finance/FinanceModule.Codeunit.al
@@ -75,6 +75,7 @@ codeunit 5415 "Finance Module" implements "Contoso Demo Data Module"
         Codeunit.Run(Codeunit::"Categ. Generate Acc. Schedules");
         Codeunit.Run(Codeunit::"Create Currency Exchange Rate");
         Codeunit.Run(Codeunit::"Create Resource");
+        Codeunit.Run(Codeunit::"Create Add. Reporting Currency")
     end;
 
     procedure CreateTransactionalData()