diff --git a/resources/assets/js/plugins/form.js b/resources/assets/js/plugins/form.js
index e7e7314b3..6018dc7ff 100644
--- a/resources/assets/js/plugins/form.js
+++ b/resources/assets/js/plugins/form.js
@@ -56,7 +56,7 @@ export default class Form {
 
                 if (type == 'radio') {
                     if (!this[form_element.getAttribute('data-field')][name]) {
-                        this[form_element.getAttribute('data-field')][name] = (form_element.getAttribute('value') ? 1 : 0) || 0;
+                        this[form_element.getAttribute('data-field')][name] = (form_element.getAttribute('value') ? form_element.getAttribute('value') : 0) || 0;
                     }
                 } else if (type == 'checkbox') {
                     if (this[form_element.getAttribute('data-field')][name]) {
@@ -83,7 +83,7 @@ export default class Form {
 
             if (type == 'radio') {
                 if (!this[name]) {
-                    this[name] = (form_element.getAttribute('value') ? 1 : 0) || 0;
+                    this[name] = (form_element.getAttribute('value') ? form_element.getAttribute('value') : 0) || 0;
                 }
             } else if (type == 'checkbox') {
                 if (this[name]) {
diff --git a/resources/views/partials/form/invoice_text.blade.php b/resources/views/partials/form/invoice_text.blade.php
index 41a86f0cc..fe1129e93 100644
--- a/resources/views/partials/form/invoice_text.blade.php
+++ b/resources/views/partials/form/invoice_text.blade.php
@@ -1,88 +1,62 @@
 @stack($name . '_input_start')
-    <div class="{{ $col }} input-group-invoice-text">
-        <akaunting-select
-            class="float-left{{ isset($attributes['required']) ? ' required' : '' }}{{ isset($attributes['disabled']) ? ' disabled' : '' }}"
 
-            @if (!empty($attributes['v-error']))
-            :form-classes="[{'has-error': {{ $attributes['v-error'] }} }, form.{{ $name }} == 'custom' ? 'col-md-6' : 'col-md-12']"
-            @else
-            :form-classes="[{'has-error': form.errors.has('{{ $name }}') }, form.{{ $name }} == 'custom' ? 'col-md-6' : 'col-md-12']"
-            @endif
+<div
+    class="form-group {{ $col }}{{ isset($attributes['required']) ? ' required' : '' }}{{ isset($attributes['readonly']) ? ' readonly' : '' }}{{ isset($attributes['disabled']) ? ' disabled' : '' }}"
+    :class="[{'has-error': {{ isset($attributes['v-error']) ? $attributes['v-error'] : 'form.errors.get("' . $name . '")' }} }]">
+    @if (!empty($text))
+        {!! Form::label($name, $text, ['class' => 'form-control-label'])!!}
+    @endif
 
-            icon="{{ $icon }}"
-            title="{{ $text }}"
-            placeholder="{{ trans('general.form.select.field', ['field' => $text]) }}"
-            name="{{ $name }}"
-            :options="{{ json_encode($values) }}"
+    <div class="input-group-invoice-text">
+        @foreach ($values as $input_key => $input_value)
+            <div class="custom-control custom-radio mb-2">
+                <input 
+                    type="radio"
+                    id="{{ $name }}-{{ $input_key }}"
+                    name="{{ $name }}"
+                    v-model="form.{{ $name }}"
+                    @change="form.errors.clear('{{ $name }}');"
+                    class="custom-control-input"
+                    @if($selected == $input_value)
+                    checked
+                    @endif
+                    value="{{ $input_key }}">
+                <label for="{{ $name }}-{{ $input_key }}" class="custom-control-label"> {{ $input_value }} </label>
 
-            @if (isset($selected) || old($name))
-            value="{{ old($name, $selected) }}"
-            @endif
+                @if ($input_key == 'custom')
+                <div :class="[{'has-error': form.errors.get('{{ $input_name }}')}, form.{{ $name }} == 'custom' ? 'col-md-12' : 'd-none']"
+                    style="margin-top: -25px; padding-left: 5.5rem;"
+                >
+                    <div class="input-group input-group-merge {{ $group_class }}">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text">
+                                <i class="fa fa-{{ $icon }}"></i>
+                            </span>
+                        </div>
 
-            @if (!empty($attributes['model']))
-            :model="{{ $attributes['model'] }}"
-            @endif
+                        {!! Form::text($input_name, $input_value, [
+                            'class' => 'form-control',
+                            'data-name' => $input_name,
+                            'data-value' => $input_value,
+                            'placeholder' => trans('general.form.enter', ['field' => $text]),
+                            'v-model' => !empty($attributes['v-model']) ? $attributes['v-model'] : (!empty($attributes['data-field']) ? 'form.' . $attributes['data-field'] . '.'. $input_name : 'form.' . $input_name),
+                        ]) !!}
+                    </div>
 
-            @if (!empty($attributes['v-model']))
-            @interface="form.errors.clear('{{ $attributes['v-model'] }}'); {{ $attributes['v-model'] . ' = $event' }}"
-            @elseif (!empty($attributes['data-field']))
-            @interface="form.errors.clear('{{ 'form.' . $attributes['data-field'] . '.' . $name }}'); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
-            @else
-            @interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event;"
-            @endif
-
-            @if (!empty($attributes['change']))
-            @change="{{ $attributes['change'] }}($event)"
-            @endif
-
-            @if (isset($attributes['readonly']))
-            :readonly="{{ $attributes['readonly'] }}"
-            @endif
-
-            @if (isset($attributes['disabled']))
-            :disabled="{{ $attributes['disabled'] }}"
-            @endif
-
-            @if (isset($attributes['show']))
-            v-if="{{ $attributes['show'] }}"
-            @endif
-
-            @if (isset($attributes['v-error-message']))
-            :form-error="{{ $attributes['v-error-message'] }}"
-            @else
-            :form-error="form.errors.get('{{ $name }}')"
-            @endif
-
-            no-data-text="{{ trans('general.no_data') }}"
-            no-matching-data-text="{{ trans('general.no_matching_data') }}"
-        ></akaunting-select>
-
-        <div
-            class="form-group float-left{{ isset($attributes['required']) ? ' required' : '' }}{{ isset($attributes['readonly']) ? ' readonly' : '' }}{{ isset($attributes['disabled']) ? ' disabled' : '' }}"
-            :class="[{'has-error': form.errors.get('{{ $input_name }}')}, form.{{ $name }} == 'custom' ? 'col-md-6' : 'd-none']">
-            {!! Form::label($input_name, trans('settings.invoice.custom'), ['class' => 'form-control-label'])!!}
-
-            <div class="input-group input-group-merge {{ $group_class }}">
-                <div class="input-group-prepend">
-                    <span class="input-group-text">
-                        <i class="fa fa-{{ $icon }}"></i>
-                    </span>
+                    <div class="invalid-feedback d-block"
+                        v-if="form.errors.has('{{ $input_name }}')"
+                        v-html="form.errors.get('{{ $input_name }}')">
+                    </div>
                 </div>
-
-                {!! Form::text($input_name, $input_value, [
-                    'class' => 'form-control',
-                    'data-name' => $input_name,
-                    'data-value' => $input_value,
-                    'placeholder' => trans('general.form.enter', ['field' => $text]),
-                    'v-model' => !empty($attributes['v-model']) ? $attributes['v-model'] : (!empty($attributes['data-field']) ? 'form.' . $attributes['data-field'] . '.'. $input_name : 'form.' . $input_name),
-                ]) !!}
+                @endif
             </div>
-
-            <div class="invalid-feedback d-block"
-                v-if="form.errors.has('{{ $input_name }}')"
-                v-html="form.errors.get('{{ $input_name }}')">
-            </div>
-        </div>
+        @endforeach
     </div>
 
+    <div class="invalid-feedback d-block"
+        v-if="{{ isset($attributes['v-error']) ? $attributes['v-error'] : 'form.errors.has("' . $name . '")' }}"
+        v-html="{{ isset($attributes['v-error-message']) ? $attributes['v-error-message'] : 'form.errors.get("' . $name . '")' }}">
+    </div>
+</div>
+
 @stack($name . '_input_end')