diff --git a/client/src/containers/Accounting/MakeJournalEntriesForm.js b/client/src/containers/Accounting/MakeJournalEntriesForm.js
index 307f21cc7..5e0faf875 100644
--- a/client/src/containers/Accounting/MakeJournalEntriesForm.js
+++ b/client/src/containers/Accounting/MakeJournalEntriesForm.js
@@ -3,7 +3,7 @@ import { Formik, Form } from 'formik';
 import moment from 'moment';
 import { Intent } from '@blueprintjs/core';
 import { useIntl } from 'react-intl';
-import { pick } from 'lodash';
+import { pick, defaultTo } from 'lodash';
 import classNames from 'classnames';
 import { useHistory } from 'react-router-dom';
 
@@ -78,7 +78,7 @@ function MakeJournalEntriesForm({
   // #withSettings
   journalNextNumber,
   journalNumberPrefix,
-
+  baseCurrency,
   // #ownProps
   manualJournalId,
   manualJournal,
@@ -126,7 +126,8 @@ function MakeJournalEntriesForm({
           }
         : {
             ...defaultInitialValues,
-            journal_number: journalNumber,
+            journal_number: defaultTo(journalNumber, ''),
+            currency_code: defaultTo(baseCurrency, ''),
             entries: orderingLinesIndexes(defaultInitialValues.entries),
           }),
     }),
@@ -239,7 +240,7 @@ function MakeJournalEntriesForm({
         validationSchema={isNewMode ? CreateJournalSchema : EditJournalSchema}
         onSubmit={handleSubmit}
       >
-        {({ isSubmitting}) => (
+        {({ isSubmitting }) => (
           <Form>
             <MakeJournalEntriesHeader
               manualJournal={manualJournalId}
@@ -274,9 +275,10 @@ export default compose(
   withAccountsActions,
   withDashboardActions,
   withMediaActions,
-  withSettings(({ manualJournalsSettings }) => ({
+  withSettings(({ manualJournalsSettings, organizationSettings }) => ({
     journalNextNumber: parseInt(manualJournalsSettings?.nextNumber, 10),
     journalNumberPrefix: manualJournalsSettings?.numberPrefix,
+    baseCurrency: organizationSettings?.baseCurrency,
   })),
   withManualJournalsActions,
 )(MakeJournalEntriesForm);
diff --git a/client/src/containers/Accounting/MakeJournalEntriesHeaderFields.js b/client/src/containers/Accounting/MakeJournalEntriesHeaderFields.js
index f58927935..ca2ae619b 100644
--- a/client/src/containers/Accounting/MakeJournalEntriesHeaderFields.js
+++ b/client/src/containers/Accounting/MakeJournalEntriesHeaderFields.js
@@ -48,6 +48,7 @@ function MakeJournalEntriesHeader({
 
   return (
     <div className={classNames(CLASSES.PAGE_FORM_HEADER_FIELDS)}>
+      {/*------------ Posting date -----------*/}
       <FastField name={'date'}>
         {({ form, field: { value }, meta: { error, touched } }) => (
           <FormGroup
@@ -77,6 +78,7 @@ function MakeJournalEntriesHeader({
         )}
       </FastField>
 
+      {/*------------ Journal number -----------*/}
       <FastField name={'journal_number'}>
         {({ form, field, meta: { error, touched } }) => (
           <FormGroup
@@ -115,6 +117,7 @@ function MakeJournalEntriesHeader({
         )}
       </FastField>
 
+      {/*------------ Reference -----------*/}
       <FastField name={'reference'}>
         {({ form, field, meta: { error, touched } }) => (
           <FormGroup
@@ -136,14 +139,12 @@ function MakeJournalEntriesHeader({
         )}
       </FastField>
 
+      {/*------------ Journal type  -----------*/}
       <FastField name={'journal_type'}>
         {({ form, field, meta: { error, touched } }) => (
           <FormGroup
             label={<T id={'journal_type'} />}
-            className={classNames(
-              'form-group--account-type',
-              CLASSES.FILL,
-            )}
+            className={classNames('form-group--account-type', CLASSES.FILL)}
             inline={true}
           >
             <InputGroup
@@ -155,14 +156,12 @@ function MakeJournalEntriesHeader({
         )}
       </FastField>
 
-      <FastField name={'currency'}>
+      {/*------------ Currency  -----------*/}
+      <FastField name={'currency_code'}>
         {({ form, field: { value }, meta: { error, touched } }) => (
           <FormGroup
             label={<T id={'currency'} />}
-            className={classNames(
-              'form-group--currency',
-              CLASSES.FILL,
-            )}
+            className={classNames('form-group--currency', CLASSES.FILL)}
             inline={true}
           >
             <CurrencySelectList