diff --git a/app/Http/Controllers/Banking/Accounts.php b/app/Http/Controllers/Banking/Accounts.php
index 9f1c7f699..70e4c76b1 100644
--- a/app/Http/Controllers/Banking/Accounts.php
+++ b/app/Http/Controllers/Banking/Accounts.php
@@ -83,7 +83,7 @@ class Accounts extends Controller
 
         $account->default_account = ($account->id == setting('general.default_account')) ?: 1;
 
-        $currency = Currency::where('code', '=', setting('general.default_currency', 'USD'))->first();
+        $currency = Currency::where('code', '=', $account->currency_code)->first();
 
         return view('banking.accounts.edit', compact('account', 'currencies', 'currency'));
     }
diff --git a/app/Http/Middleware/Money.php b/app/Http/Middleware/Money.php
index 67f0bcef4..d322d0637 100644
--- a/app/Http/Middleware/Money.php
+++ b/app/Http/Middleware/Money.php
@@ -21,6 +21,7 @@ class Money
             $invoice_number = $request->get('invoice_number');
             $sale_price = $request->get('sale_price');
             $purchase_price = $request->get('purchase_price');
+            $opening_balance = $request->get('opening_balance');
             $currency_code = $request->get('currency_code');
 
             if (empty($currency_code)) {
@@ -45,6 +46,12 @@ class Money
                 }
             }
 
+            if (isset($opening_balance)) {
+                $opening_balance = money($opening_balance, $currency_code)->getAmount();
+
+                $request->request->set('opening_balance', $opening_balance);
+            }
+
             /* check item price use money
             if (isset($sale_price)) {
                 $sale_price = money($sale_price, $currency_code)->getAmount();
diff --git a/resources/views/banking/transfers/create.blade.php b/resources/views/banking/transfers/create.blade.php
index bdd08d6cb..7a5bb9b24 100644
--- a/resources/views/banking/transfers/create.blade.php
+++ b/resources/views/banking/transfers/create.blade.php
@@ -21,6 +21,9 @@
             {{ Form::selectGroup('payment_method', trans_choice('general.payment_methods', 1), 'credit-card', $payment_methods, setting('general.default_payment_method')) }}
 
             {{ Form::textGroup('reference', trans('general.reference'), 'file-text-o', []) }}
+
+            {!! Form::hidden('currency_code', null, ['id' => 'currency_code']) !!}
+            {!! Form::hidden('currency_rate', null, ['id' => 'currency_rate']) !!}
         </div>
         <!-- /.box-body -->
 
diff --git a/resources/views/banking/transfers/edit.blade.php b/resources/views/banking/transfers/edit.blade.php
index 435412aa0..42904f9df 100644
--- a/resources/views/banking/transfers/edit.blade.php
+++ b/resources/views/banking/transfers/edit.blade.php
@@ -25,6 +25,9 @@
             {{ Form::selectGroup('payment_method', trans_choice('general.payment_methods', 1), 'credit-card', $payment_methods, null) }}
 
             {{ Form::textGroup('reference', trans('general.reference'), 'file-text-o', []) }}
+
+            {!! Form::hidden('currency_code', $currency->code, ['id' => 'currency_code']) !!}
+            {!! Form::hidden('currency_rate', $currency->rate, ['id' => 'currency_rate']) !!}
         </div>
         <!-- /.box-body -->