diff --git a/app/Http/Controllers/Settings/Currencies.php b/app/Http/Controllers/Settings/Currencies.php
index 916845ee5..2d26c29b3 100644
--- a/app/Http/Controllers/Settings/Currencies.php
+++ b/app/Http/Controllers/Settings/Currencies.php
@@ -233,10 +233,12 @@ class Currencies extends Controller
 
         $code = request('code');
 
+        $currencies = Currency::all()->pluck('rate', 'code');
+
         if ($code) {
             $currency = config('money.' . $code);
 
-            $currency['rate'] = isset($currency['rate']) ? $currency['rate'] : null;
+            $currency['rate'] = isset($currencies[$code]) ? $currencies[$code] : null;
             $currency['symbol_first'] = $currency['symbol_first'] ? 1 : 0;
 
             $json = (object) $currency;
diff --git a/resources/views/partials/wizard/content.blade.php b/resources/views/partials/wizard/content.blade.php
index 9fdc71051..fc161692b 100644
--- a/resources/views/partials/wizard/content.blade.php
+++ b/resources/views/partials/wizard/content.blade.php
@@ -13,6 +13,6 @@
         @yield('content')
 
     @stack('content_content_end')
-
     <notifications></notifications>
+    <component v-bind:is="component"></component>
 @stack('content_end')
diff --git a/resources/views/wizard/currencies/index.blade.php b/resources/views/wizard/currencies/index.blade.php
index 9a90341c6..e77eb2508 100644
--- a/resources/views/wizard/currencies/index.blade.php
+++ b/resources/views/wizard/currencies/index.blade.php
@@ -84,7 +84,7 @@
                                 {{ Form::textGroup('name', trans('general.name'), 'font', [], null, '') }}
                             </td>
                             <td class="col-md-3 d-none d-md-block">
-                                {{ Form::selectGroup('code', trans('currencies.code'), 'code', $codes, null, ['required' => 'required', 'change' => 'onChangeCode'], '') }}
+                                {{ Form::selectGroup('code', trans('currencies.code'), 'code', $codes, null, ['required' => 'required', 'change' => 'onChangeCode', 'model' => 'form.code'], '') }}
                             </td>
                             <td class="col-md-2 d-none d-md-block">
                                 {{ Form::textGroup('rate', trans('currencies.rate'), 'percentage', ['required' => 'required'], null, '') }}