diff --git a/app/Http/Controllers/ManufacturersController.php b/app/Http/Controllers/ManufacturersController.php
index 1f7d2f2c07..e849d70a14 100755
--- a/app/Http/Controllers/ManufacturersController.php
+++ b/app/Http/Controllers/ManufacturersController.php
@@ -123,7 +123,7 @@ class ManufacturersController extends Controller
             return redirect()->route('manufacturers.index')->with('error', trans('admin/manufacturers/message.does_not_exist'));
         }
 
-        // Save the  data
+        // Save the data
         $manufacturer->name = $request->input('name');
         $manufacturer->url = $request->input('url');
         $manufacturer->support_url = $request->input('support_url');
diff --git a/app/Models/Manufacturer.php b/app/Models/Manufacturer.php
index 5f01c3c273..099a978778 100755
--- a/app/Models/Manufacturer.php
+++ b/app/Models/Manufacturer.php
@@ -23,8 +23,8 @@ class Manufacturer extends SnipeModel
     protected $rules = [
         'name'   => 'required|min:2|max:255|unique:manufacturers,name,NULL,id,deleted_at,NULL',
         'url'   => 'url|nullable',
-        'support_url'   => 'url|nullable',
         'support_email'   => 'email|nullable',
+        'support_url'   => 'starts_with:http://,https://,afp://,facetime://,file://,irc://','nullable',
     ];
 
     protected $hidden = ['user_id'];
diff --git a/app/Presenters/AssetPresenter.php b/app/Presenters/AssetPresenter.php
index 4be0f56010..06364fe31a 100644
--- a/app/Presenters/AssetPresenter.php
+++ b/app/Presenters/AssetPresenter.php
@@ -534,6 +534,20 @@ class AssetPresenter extends Presenter
         return false;
     }
 
+    /**
+     * Used to take user created warranty URL and dynamically fill in the needed values per asset
+     * @return string
+     */
+    public function supportUrl()
+    {
+        $tempurl = $this->model->model->manufacturer->support_url;
+
+        $tempurl = (str_replace('{LOCALE}',\App\Models\Setting::getSettings()->locale,$tempurl));
+        $tempurl = (str_replace('{SERIAL}',$this->model->serial,$tempurl));
+
+        return $tempurl;
+    }
+
     /**
      * Url to view this item.
      * @return string
diff --git a/resources/lang/en/admin/manufacturers/message.php b/resources/lang/en/admin/manufacturers/message.php
index 21a4bc5aaf..d6656683ae 100644
--- a/resources/lang/en/admin/manufacturers/message.php
+++ b/resources/lang/en/admin/manufacturers/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
     'does_not_exist' => 'Manufacturer does not exist.',
     'assoc_users'	 => 'This manufacturer is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this manufacturer and try again. ',
 
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index ccd3f86536..1cea928469 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -596,19 +596,9 @@
                                                 {{ trans('admin/hardware/form.months') }}
 
                                                 @if ($asset->serial && $asset->model->manufacturer)
-                                                    @if ((strtolower($asset->model->manufacturer->name) == "apple") || (str_starts_with(str_replace(' ','',strtolower($asset->model->manufacturer->name)),"appleinc")))
-                                                    <a href="https://checkcoverage.apple.com/?locale={{ (str_replace('-','_',\App\Models\Setting::getSettings()->locale)) }}" target="_blank">
-                                                        <i class="fa-brands fa-apple" aria-hidden="true"><span class="sr-only">{{ trans('hardware/general.mfg_warranty_lookup') }}</span></i>
+                                                    <a href="{{ $asset->present()->supportUrl() }}" target="_blank">
+                                                        <i class="fa fa-external-link" style="width:25px;height:25px;"><span class="sr-only">{{ trans('hardware/general.mfg_warranty_lookup') }}</span></i>
                                                     </a>
-                                                    @elseif ((strtolower($asset->model->manufacturer->name) == "dell") || (str_starts_with(str_replace(' ','',strtolower($asset->model->manufacturer->name)),"dellinc")))
-                                                    <a href="https://www.dell.com/support/home/en-us?app=warranty" target="_blank">
-                                                        <img src="/img/demo/manufacturers/dellicon.png" style="width:25px;height:25px;"><span class="sr-only">{{ trans('hardware/general.mfg_warranty_lookup') }}</span></i>
-                                                    </a>
-                                                    @elseif ((strtolower($asset->model->manufacturer->name) == "lenovo") || (str_starts_with(str_replace(' ','',strtolower($asset->model->manufacturer->name)),"lenovoinc")))
-                                                    <a href="https://pcsupport.lenovo.com/us/en/warrantylookup#/" target="_blank">
-                                                        <img src="/img/demo/manufacturers/lenovoicon.png" style="width:25px;height:25px;"><span class="sr-only">{{ trans('hardware/general.mfg_warranty_lookup') }}</span></i>
-                                                    </a>
-                                                    @endif
                                                 @endif
                                             </div>
                                         </div>
diff --git a/resources/views/manufacturers/edit.blade.php b/resources/views/manufacturers/edit.blade.php
index fbbb812ba6..c533718b85 100755
--- a/resources/views/manufacturers/edit.blade.php
+++ b/resources/views/manufacturers/edit.blade.php
@@ -26,6 +26,7 @@
         </label>
         <div class="col-md-6">
             <input class="form-control" type="text" name="support_url" id="support_url" value="{{ old('support_url', $item->support_url) }}" />
+            <p class="help-block">{!! trans('admin/manufacturers/message.support_url_help') !!}</p>
             {!! $errors->first('support_url', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
         </div>
     </div>
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index 21a4f29349..3e6a9ea3b0 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -269,12 +269,19 @@
             }
 
             if ((row.available_actions) && (row.available_actions.delete === true)) {
+
+                // use the asset tag if no name is provided
+                var name_for_box = row.name
+                if (row.name=='') {
+                    var name_for_box = row.asset_tag
+                }
+                
                 actions += '<a href="{{ config('app.url') }}/' + dest + '/' + row.id + '" '
                     + ' class="btn btn-danger btn-sm delete-asset" data-tooltip="true"  '
                     + ' data-toggle="modal" '
-                    + ' data-content="{{ trans('general.sure_to_delete') }} ' + row.name + '?" '
+                    + ' data-content="{{ trans('general.sure_to_delete') }} ' + name_for_box + '?" '
                     + ' data-title="{{  trans('general.delete') }}" onClick="return false;">'
-                    + '<i class="fas fa-trash" aria-hidden="true"></i><span class="sr-only">Delete</span></a>&nbsp;';
+                    + '<i class="fas fa-trash" aria-hidden="true"></i><span class="sr-only">{{ trans('general.delete') }}</span></a>&nbsp;';
             } else {
                 actions += '<span data-tooltip="true" title="{{ trans('general.cannot_be_deleted') }}"><a class="btn btn-danger btn-sm delete-asset disabled" onClick="return false;"><i class="fas fa-trash"></i></a></span>&nbsp;';
             }