diff --git a/resources/macros/macros.php b/resources/macros/macros.php
index a6b5ca6c55..7e237af5cc 100644
--- a/resources/macros/macros.php
+++ b/resources/macros/macros.php
@@ -220,24 +220,6 @@ Form::macro('username_format', function ($name = 'username_format', $selected =
     return $select;
 });
 
-Form::macro('two_factor_options', function ($name = 'two_factor_enabled', $selected = null, $class = null) {
-    $formats = [
-        '' => trans('admin/settings/general.two_factor_disabled'),
-        '1' => trans('admin/settings/general.two_factor_optional'),
-        '2' => trans('admin/settings/general.two_factor_required'),
-
-    ];
-
-    $select = '<select name="'.$name.'" class="'.$class.'" aria-label="'.$name.'">';
-    foreach ($formats as $format => $label) {
-        $select .= '<option value="'.$format.'"'.($selected == $format ? ' selected="selected" role="option" aria-selected="true"' : ' aria-selected="false"').'>'.$label.'</option> '."\n";
-    }
-
-    $select .= '</select>';
-
-    return $select;
-});
-
 Form::macro('customfield_elements', function ($name = 'customfield_elements', $selected = null, $class = null) {
     $formats = [
         'text' => 'Text Box',
diff --git a/resources/views/settings/security.blade.php b/resources/views/settings/security.blade.php
index f1b5f42498..6c1b1ea69c 100644
--- a/resources/views/settings/security.blade.php
+++ b/resources/views/settings/security.blade.php
@@ -48,8 +48,15 @@
                                     <label for="two_factor_enabled">{{ trans('admin/settings/general.two_factor_enabled_text') }}</label>
                                 </div>
                                 <div class="col-md-9">
-
-                                    {!! Form::two_factor_options('two_factor_enabled', old('two_factor_enabled', $setting->two_factor_enabled), 'select2') !!}
+                                    <x-input.select
+                                        name="two_factor_enabled"
+                                        :selected="old('two_factor_enabled', $setting->two_factor_enabled)"
+                                        :options="[
+                                            '' => trans('admin/settings/general.two_factor_disabled'),
+                                            '1' => trans('admin/settings/general.two_factor_optional'),
+                                            '2' => trans('admin/settings/general.two_factor_required'),
+                                        ]"
+                                    />
                                     <p class="help-block">{{ trans('admin/settings/general.two_factor_enabled_warning') }}</p>
 
                                     @if (config('app.lock_passwords'))