diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index 299a14c6c6..50f2016759 100644
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -14,6 +14,7 @@ use App\Http\Requests\StoreLabelSettings;
 use App\Http\Requests\StoreSecuritySettings;
 use App\Models\CustomField;
 use App\Models\Group;
+use App\Models\Labels\Label as LabelModel;
 use App\Models\Setting;
 use App\Models\Asset;
 use App\Models\User;
@@ -749,6 +750,7 @@ class SettingsController extends Controller
         return view('settings.labels')
             ->with('setting', Setting::getSettings())
             ->with('is_gd_installed', $is_gd_installed)
+            ->with('template', LabelModel::find(Setting::getSettings()->label2_template))
             ->with('customFields', CustomField::where('field_encrypted', '=', 0)->get());
     }
 
diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php
index ae79c061a8..fdc6313bd2 100644
--- a/resources/views/settings/labels.blade.php
+++ b/resources/views/settings/labels.blade.php
@@ -313,26 +313,24 @@
                                     <p class="help-block">{{ trans('admin/settings/general.label2_2d_target_help') }}</p>
                                 </div>
                             </div>
-                            <!-- Title -->
+                            <!-- Field offset -->
                             <div class="form-group{{ $errors->has('label2_empty_row_count') ? ' has-error' : '' }}">
                                 <div class="col-md-3 text-right">
-                                    <label for="label2_empty_row_count" class="control-label">{{trans('admin/settings/general.empty_row_count')}}</label>
+                                    <label for="label2_empty_row_count" class="control-label">{{ trans('admin/settings/general.empty_row_count') }}</label>
                                 </div>
-                                <div class="form-group row">
-                                    <div class="col-md-2">
+                                <div class="col-md-9">
                                         <input
-                                                class="form-control"
+                                                class="form-control col-md-2"
                                                 aria-label="Empty Row Count"
                                                 name="label2_empty_row_count"
                                                 type="number"
                                                 id="label2_empty_row_count"
                                                 min="0"
-                                                value="{{ old('label2_empty_row_count', $setting->label2_empty_row_count) }}">
-                                    </div>
-                                    <div class="col-md-7">
-                                        {!! $errors->first('empty_row_count', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                                        <p class="help-block">{!! trans('admin/settings/general.empty_row_count_help') !!}</p>
-                                    </div>
+                                                max="{{ $template->getSupportFields() }}"
+                                                value="{{ old('label2_empty_row_count', $setting->label2_empty_row_count) }}"
+                                        >
+                                    {!! $errors->first('label2_empty_row_count', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                                    <p class="help-block">{!! trans('admin/settings/general.empty_row_count_help') !!}</p>
                                 </div>
                             </div>
                             <div class="col-md-9 col-md-offset-3" style="margin-bottom: 10px;">