diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php
index 50a758ac37eb..8303c3a0b27c 100755
--- a/app/Http/Controllers/Assets/AssetsController.php
+++ b/app/Http/Controllers/Assets/AssetsController.php
@@ -506,7 +506,6 @@ public function getAssetByTag(Request $request, $tag=null) : RedirectResponse
         return redirect()->route('hardware.show', $asset->id)->with('topsearch', $topsearch);
     }
 
-
     /**
      * Return a QR code for the asset
      *
diff --git a/app/View/Label.php b/app/View/Label.php
index 8868306591aa..a79f50ee4351 100644
--- a/app/View/Label.php
+++ b/app/View/Label.php
@@ -125,6 +125,7 @@ public function render(callable $callback = null)
                     if (($barcode2DType != 'none') && (!is_null($barcode2DType))) {
                         switch ($settings->label2_2d_target) {
                             case 'ht_tag': $barcode2DTarget = route('ht/assetTag', $asset->asset_tag); break;
+                            case 'asset_tag' : $barcode2DTarget = basename(route('ht/assetTag', $asset->asset_tag)); break;
                             case 'hardware_id':
                             default: $barcode2DTarget = route('hardware.show', ['hardware' => $asset->id]); break;
                         }
diff --git a/resources/lang/en-US/admin/settings/general.php b/resources/lang/en-US/admin/settings/general.php
index d656391edd5a..26f796fa7b4c 100644
--- a/resources/lang/en-US/admin/settings/general.php
+++ b/resources/lang/en-US/admin/settings/general.php
@@ -360,7 +360,7 @@
     'label2_2d_type'          => '2D Barcode Type',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'What the 2D barcode points to when scanned',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php
index 33640edbf28a..7f1768bfc0c8 100644
--- a/resources/views/settings/labels.blade.php
+++ b/resources/views/settings/labels.blade.php
@@ -204,7 +204,7 @@ class="table table-striped snipe-table"
                                     {{ Form::label('label2_2d_target', trans('admin/settings/general.label2_2d_target'), ['class'=>'control-label']) }}
                                 </div>
                                 <div class="col-md-9">
-                                    {{ Form::select('label2_2d_target', ['hardware_id'=>'/hardware/{id} ('.trans('admin/settings/general.default').')', 'ht_tag'=>'/ht/{asset_tag}'], old('label2_2d_target', $setting->label2_2d_target), [ 'class'=>'select2 col-md-4', 'aria-label'=>'label2_2d_target' ]) }}
+                                    {{ Form::select('label2_2d_target', ['hardware_id'=>'URL: /hardware/{id} ('.trans('admin/settings/general.default').')', 'ht_tag'=>'URL: /ht/{asset_tag}', 'asset_tag' =>'VALUE: {asset_tag}'], old('label2_2d_target', $setting->label2_2d_target), [ 'class'=>'select2 col-md-5', 'aria-label'=>'label2_2d_target' ]) }}
                                     {!! $errors->first('label2_2d_target', '<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.label2_2d_target_help') }}</p>
                                 </div>