diff --git a/resources/assets/js/plugins/form.js b/resources/assets/js/plugins/form.js
index fd0632213..2fc637f90 100644
--- a/resources/assets/js/plugins/form.js
+++ b/resources/assets/js/plugins/form.js
@@ -44,7 +44,7 @@ export default class Form {
 
             if (type == 'radio') {
                 if (!this[name]) {
-                    this[name] = form_element.getAttribute('value') || '';
+                    this[name] = (form_element.getAttribute('value') ? 1 : 0) || 0;
                 }
             } else if (type == 'checkbox') {
                 if (this[name]) {
diff --git a/resources/views/auth/users/create.blade.php b/resources/views/auth/users/create.blade.php
index 9fa229616..53d80ca38 100644
--- a/resources/views/auth/users/create.blade.php
+++ b/resources/views/auth/users/create.blade.php
@@ -49,7 +49,7 @@
                         {{ Form::checkboxGroup('roles', trans_choice('general.roles', 2), $roles, 'display_name') }}
                     @endpermission
 
-                    {{ Form::radioGroup('enabled', trans('general.enabled')) }}
+                    {{ Form::radioGroup('enabled', trans('general.enabled'), true) }}
                 </div>
             </div>
 
diff --git a/resources/views/auth/users/edit.blade.php b/resources/views/auth/users/edit.blade.php
index c6937ad0f..30098c248 100644
--- a/resources/views/auth/users/edit.blade.php
+++ b/resources/views/auth/users/edit.blade.php
@@ -50,7 +50,7 @@
                         {{ Form::checkboxGroup('roles', trans_choice('general.roles', 2), $roles, 'display_name') }}
                     @endpermission
 
-                    {{ Form::radioGroup('enabled', trans('general.enabled')) }}
+                    {{ Form::radioGroup('enabled', trans('general.enabled'), $user->enabled) }}
                 </div>
             </div>
 
diff --git a/resources/views/banking/accounts/create.blade.php b/resources/views/banking/accounts/create.blade.php
index 446787c86..0c9d5487e 100644
--- a/resources/views/banking/accounts/create.blade.php
+++ b/resources/views/banking/accounts/create.blade.php
@@ -31,9 +31,9 @@
 
                     {{ Form::textareaGroup('bank_address', trans('accounts.bank_address')) }}
 
-                    {{ Form::radioGroup('default_account', trans('accounts.default_account')) }}
+                    {{ Form::radioGroup('default_account', trans('accounts.default_account'), false) }}
 
-                    {{ Form::radioGroup('enabled', trans('general.enabled')) }}
+                    {{ Form::radioGroup('enabled', trans('general.enabled'), true) }}
                 </div>
             </div>
 
diff --git a/resources/views/banking/accounts/edit.blade.php b/resources/views/banking/accounts/edit.blade.php
index e6138c2d8..d98347c13 100644
--- a/resources/views/banking/accounts/edit.blade.php
+++ b/resources/views/banking/accounts/edit.blade.php
@@ -32,9 +32,9 @@
 
                     {{ Form::textareaGroup('bank_address', trans('accounts.bank_address')) }}
 
-                    {{ Form::radioGroup('default_account', trans('accounts.default_account')) }}
+                    {{ Form::radioGroup('default_account', trans('accounts.default_account'), $account->default_account) }}
 
-                    {{ Form::radioGroup('enabled', trans('general.enabled')) }}
+                    {{ Form::radioGroup('enabled', trans('general.enabled'), $account->enabled) }}
                 </div>
             </div>
 
diff --git a/resources/views/common/companies/create.blade.php b/resources/views/common/companies/create.blade.php
index 43246b39e..b3ec0a781 100644
--- a/resources/views/common/companies/create.blade.php
+++ b/resources/views/common/companies/create.blade.php
@@ -29,7 +29,7 @@
 
                     {{ Form::fileGroup('logo', trans('companies.logo')) }}
 
-                    {{ Form::radioGroup('enabled', trans('general.enabled')) }}
+                    {{ Form::radioGroup('enabled', trans('general.enabled'), true) }}
                 </div>
             </div>
 
diff --git a/resources/views/common/companies/edit.blade.php b/resources/views/common/companies/edit.blade.php
index ebe67837b..ac4e79ac8 100644
--- a/resources/views/common/companies/edit.blade.php
+++ b/resources/views/common/companies/edit.blade.php
@@ -30,7 +30,7 @@
 
                     {{ Form::fileGroup('logo', trans('companies.logo')) }}
 
-                    {{ Form::radioGroup('enabled', trans('general.enabled')) }}
+                    {{ Form::radioGroup('enabled', trans('general.enabled'), $company->enabled) }}
                 </div>
             </div>
 
diff --git a/resources/views/common/items/create.blade.php b/resources/views/common/items/create.blade.php
index 95af7ba87..6ad30c566 100644
--- a/resources/views/common/items/create.blade.php
+++ b/resources/views/common/items/create.blade.php
@@ -31,7 +31,7 @@
 
                     {{ Form::fileGroup('picture', trans_choice('general.pictures', 1), 'plus') }}
 
-                    {{ Form::radioGroup('enabled', trans('general.enabled')) }}
+                    {{ Form::radioGroup('enabled', trans('general.enabled'), true) }}
                 </div>
             </div>
 
diff --git a/resources/views/common/items/edit.blade.php b/resources/views/common/items/edit.blade.php
index 1316d1b2a..f310e8171 100644
--- a/resources/views/common/items/edit.blade.php
+++ b/resources/views/common/items/edit.blade.php
@@ -32,7 +32,7 @@
 
                     {{ Form::fileGroup('picture', trans_choice('general.pictures', 1)) }}
 
-                    {{ Form::radioGroup('enabled', trans('general.enabled')) }}
+                    {{ Form::radioGroup('enabled', trans('general.enabled'), $item->enabled) }}
                 </div>
             </div>
 
diff --git a/resources/views/expenses/vendors/create.blade.php b/resources/views/expenses/vendors/create.blade.php
index 273ef5585..f12795d5f 100644
--- a/resources/views/expenses/vendors/create.blade.php
+++ b/resources/views/expenses/vendors/create.blade.php
@@ -35,7 +35,7 @@
 
                     {{ Form::textGroup('reference', trans('general.reference'), 'file', []) }}
 
-                    {{ Form::radioGroup('enabled', trans('general.enabled')) }}
+                    {{ Form::radioGroup('enabled', trans('general.enabled'), true) }}
                 </div>
             </div>
 
diff --git a/resources/views/expenses/vendors/edit.blade.php b/resources/views/expenses/vendors/edit.blade.php
index 9f81fd6db..f56dc8133 100644
--- a/resources/views/expenses/vendors/edit.blade.php
+++ b/resources/views/expenses/vendors/edit.blade.php
@@ -36,7 +36,7 @@
 
                     {{ Form::textGroup('reference', trans('general.reference'), 'file', []) }}
 
-                    {{ Form::radioGroup('enabled', trans('general.enabled')) }}
+                    {{ Form::radioGroup('enabled', trans('general.enabled'), $vendor->enabled) }}
                 </div>
             </div>
 
diff --git a/resources/views/incomes/customers/create.blade.php b/resources/views/incomes/customers/create.blade.php
index 6cc6993eb..f17d6ecdd 100644
--- a/resources/views/incomes/customers/create.blade.php
+++ b/resources/views/incomes/customers/create.blade.php
@@ -34,7 +34,7 @@
 
                 {{ Form::textGroup('reference', trans('general.reference'), 'file', []) }}
 
-                {{ Form::radioGroup('enabled', trans('general.enabled')) }}
+                {{ Form::radioGroup('enabled', trans('general.enabled'), true) }}
 
                 @stack('create_user_input_start')
                     <div id="customer-create-user" class="form-group col-md-12 margin-top">
diff --git a/resources/views/incomes/customers/edit.blade.php b/resources/views/incomes/customers/edit.blade.php
index 3a2935a71..5fe0fbc07 100644
--- a/resources/views/incomes/customers/edit.blade.php
+++ b/resources/views/incomes/customers/edit.blade.php
@@ -33,7 +33,7 @@
 
                 {{ Form::textGroup('reference', trans('general.reference'), 'file', []) }}
 
-                {{ Form::radioGroup('enabled', trans('general.enabled')) }}
+                {{ Form::radioGroup('enabled', trans('general.enabled'), $customer->enabled) }}
 
                 @stack('create_user_input_start')
                     <div id="customer-create-user" class="form-group col-md-12 margin-top">
diff --git a/resources/views/partials/form/radio_group.blade.php b/resources/views/partials/form/radio_group.blade.php
index b2de8a3e9..be58af35d 100644
--- a/resources/views/partials/form/radio_group.blade.php
+++ b/resources/views/partials/form/radio_group.blade.php
@@ -6,15 +6,17 @@
 
     <div class="tab-pane tab-example-result fade show active" role="tabpanel" aria-labelledby="-component-tab">
         <div class="btn-group btn-group-toggle radio-yes-no" data-toggle="buttons">
-            <label class="btn btn-success" @click="form.{{ $name }}=1">
+            <label class="btn btn-success" @click="form.{{ $name }}=1"  v-bind:class="{ active: form.{{ $name }} }" >
                 {{ trans('general.yes') }}
-                <input type="radio" name="{{ $name }}" id="{{ $name }}-1" value="1" v-model="{{ !empty($attributes['v-model']) ? $attributes['v-model'] : 'form.' . $name }}">
+                <input type="radio" name="{{ $name }}-1" id="{{ $name }}-1" v-model="{{ !empty($attributes['v-model']) ? $attributes['v-model'] : 'form.' . $name }}">
             </label>
 
-            <label class="btn btn-danger" @click="form.{{ $name }}=0">
+            <label class="btn btn-danger" @click="form.{{ $name }}=0" v-bind:class="{ active: !form.{{ $name }} }" >
                 {{ trans('general.no') }}
-                <input type="radio" name="{{ $name }}" id="{{ $name }}-0" value="0" v-model="{{ !empty($attributes['v-model']) ? $attributes['v-model'] : 'form.' . $name }}">
+                <input type="radio" name="{{ $name }}-0" id="{{ $name }}-0" v-model="{{ !empty($attributes['v-model']) ? $attributes['v-model'] : 'form.' . $name }}">
             </label>
+            
+            <input type="radio" value="{{ $value ? true : false }}" name="{{ $name }}" class="d-none">
         </div>
     </div>
 
diff --git a/resources/views/settings/categories/create.blade.php b/resources/views/settings/categories/create.blade.php
index 5eec10232..c27847776 100644
--- a/resources/views/settings/categories/create.blade.php
+++ b/resources/views/settings/categories/create.blade.php
@@ -36,7 +36,7 @@
                         </div>
                     @stack('color_input_end')
 
-                    {{ Form::radioGroup('enabled', trans('general.enabled')) }}
+                    {{ Form::radioGroup('enabled', trans('general.enabled'), true) }}
                 </div>
             </div>
 
diff --git a/resources/views/settings/categories/edit.blade.php b/resources/views/settings/categories/edit.blade.php
index e84518a9c..66f93b8b7 100644
--- a/resources/views/settings/categories/edit.blade.php
+++ b/resources/views/settings/categories/edit.blade.php
@@ -42,7 +42,7 @@
                         </div>
                     @stack('color_input_end')
 
-                    {{ Form::radioGroup('enabled', trans('general.enabled')) }}
+                    {{ Form::radioGroup('enabled', trans('general.enabled'), $category->enabled) }}
                 </div>
             </div>
 
diff --git a/resources/views/settings/currencies/create.blade.php b/resources/views/settings/currencies/create.blade.php
index 058d0157f..669af1d83 100644
--- a/resources/views/settings/currencies/create.blade.php
+++ b/resources/views/settings/currencies/create.blade.php
@@ -33,9 +33,9 @@
 
                     {{ Form::textGroup('thousands_separator', trans('currencies.thousands_separator'), 'slash', []) }}
 
-                    {{ Form::radioGroup('enabled', trans('general.enabled')) }}
+                    {{ Form::radioGroup('enabled', trans('general.enabled'), true) }}
 
-                    {{ Form::radioGroup('default_currency', trans('currencies.default')) }}
+                    {{ Form::radioGroup('default_currency', trans('currencies.default'), false) }}
                 </div>
             </div>
 
diff --git a/resources/views/settings/currencies/edit.blade.php b/resources/views/settings/currencies/edit.blade.php
index 04108f444..6b36cb64b 100644
--- a/resources/views/settings/currencies/edit.blade.php
+++ b/resources/views/settings/currencies/edit.blade.php
@@ -34,9 +34,9 @@
 
                     {{ Form::textGroup('thousands_separator', trans('currencies.thousands_separator'), 'slash', []) }}
 
-                    {{ Form::radioGroup('enabled', trans('general.enabled')) }}
+                    {{ Form::radioGroup('enabled', trans('general.enabled'), $currency->enabled) }}
 
-                    {{ Form::radioGroup('default_currency', trans('currencies.default')) }}
+                    {{ Form::radioGroup('default_currency', trans('currencies.default'), $currency->default_currency) }}
                 </div>
             </div>
 
diff --git a/resources/views/settings/default/edit.blade.php b/resources/views/settings/default/edit.blade.php
index 791521747..4970769f3 100644
--- a/resources/views/settings/default/edit.blade.php
+++ b/resources/views/settings/default/edit.blade.php
@@ -30,7 +30,7 @@
 
                 {{ Form::selectGroup('list_limit', trans('settings.default.list_limit'), 'columns', ['10' => '10', '25' => '25', '50' => '50', '100' => '100'], !empty($setting['list_limit']) ? $setting['list_limit'] : null, []) }}
 
-                {{ Form::radioGroup('use_gravatar', trans('settings.default.use_gravatar')) }}
+                {{ Form::radioGroup('use_gravatar', trans('settings.default.use_gravatar'), $setting->get('use_gravatar')) }}
             </div>
         </div>
 
diff --git a/resources/views/settings/schedule/edit.blade.php b/resources/views/settings/schedule/edit.blade.php
index 33499b662..754e67d4e 100644
--- a/resources/views/settings/schedule/edit.blade.php
+++ b/resources/views/settings/schedule/edit.blade.php
@@ -18,11 +18,11 @@
     <div class="card">
         <div class="card-body">
             <div class="row">
-                {{ Form::radioGroup('send_invoice_reminder', trans('settings.scheduling.send_invoice')) }}
+                {{ Form::radioGroup('send_invoice_reminder', trans('settings.scheduling.send_invoice'), $setting->get('send_invoice_reminder')) }}
 
                 {{ Form::textGroup('invoice_days', trans('settings.scheduling.invoice_days'), 'calendar', []) }}
 
-                {{ Form::radioGroup('send_bill_reminder', trans('settings.scheduling.send_bill')) }}
+                {{ Form::radioGroup('send_bill_reminder', trans('settings.scheduling.send_bill'), $setting->get('send_bill_reminder')) }}
 
                 {{ Form::textGroup('bill_days', trans('settings.scheduling.bill_days'), 'calendar', []) }}
 
diff --git a/resources/views/settings/taxes/create.blade.php b/resources/views/settings/taxes/create.blade.php
index d9521e13a..3bd01e27d 100644
--- a/resources/views/settings/taxes/create.blade.php
+++ b/resources/views/settings/taxes/create.blade.php
@@ -23,7 +23,7 @@
 
                     {{ Form::selectGroup('type', trans_choice('general.types', 1), 'bars', $types, 'normal') }}
 
-                    {{ Form::radioGroup('enabled', trans('general.enabled')) }}
+                    {{ Form::radioGroup('enabled', trans('general.enabled'), true) }}
                 </div>
             </div>
 
diff --git a/resources/views/settings/taxes/edit.blade.php b/resources/views/settings/taxes/edit.blade.php
index 57b0d5748..dcd91c850 100644
--- a/resources/views/settings/taxes/edit.blade.php
+++ b/resources/views/settings/taxes/edit.blade.php
@@ -24,7 +24,7 @@
 
                     {{ Form::selectGroup('type', trans_choice('general.types', 1), 'bars', $types, $tax->type) }}
 
-                    {{ Form::radioGroup('enabled', trans('general.enabled')) }}
+                    {{ Form::radioGroup('enabled', trans('general.enabled'), $tax->enabled) }}
                 </div>
             </div>