diff --git a/assets/templates/asset_activity_table.html b/assets/templates/asset_activity_table.html
index 166a4417..aca6142c 100644
--- a/assets/templates/asset_activity_table.html
+++ b/assets/templates/asset_activity_table.html
@@ -69,7 +69,7 @@
 
                             <tr>
                                 <td>{{ version.revision.date_created }}</td>
-                                <td><a href="{{ version.changes.new.get_absolute_url }}">{{version.changes.new|to_class_name}} {{ version.changes.new.asset_id }}</a></td>
+                                <td><a href="{{ version.changes.new.get_absolute_url }}">{{version.changes.new|to_class_name}} {{ version.changes.new.asset_id|default:version.changes.new.pk }}</a></td>
                            		<td>{{ version.pk }}|{{ version.revision.pk }}</td>
                                 <td>{{ version.revision.user.name }}</td>
                                 <td>
diff --git a/assets/templates/asset_version_history.html b/assets/templates/asset_version_history.html
index cefcd5d0..89223294 100644
--- a/assets/templates/asset_version_history.html
+++ b/assets/templates/asset_version_history.html
@@ -23,7 +23,7 @@
 <div class="col-sm-12">
         <div class="row">
             <div class="col-sm-12">
-                <h3><a href="{{ object.get_absolute_url }}">{{object|to_class_name}} {{ object.asset_id }}</a> - Revision History</h3>
+                <h3><a href="{{ object.get_absolute_url }}">{{object|to_class_name}} {{ object.asset_id|default:object.pk }}</a> - Revision History</h3>
             </div>
             <div class="text-right col-sm-12">{% paginator %}</div>
         </div>
diff --git a/assets/templates/supplier_list.html b/assets/templates/supplier_list.html
index 71ceb78c..4de91bbc 100644
--- a/assets/templates/supplier_list.html
+++ b/assets/templates/supplier_list.html
@@ -31,6 +31,7 @@
       <td>{{ item.name }}</td>
       <td>
         <a href="{% url 'supplier_update' item.pk %}" class="btn btn-default"><i class="glyphicon glyphicon-edit"></i> Edit</a>
+        <a href="{% url 'supplier_history' item.pk %}" class="btn btn-default"><i class="glyphicon glyphicon-time"></i> History</a>
       </td>
     </tr>
     {% endfor %}
diff --git a/assets/urls.py b/assets/urls.py
index e7849f91..3acac945 100644
--- a/assets/urls.py
+++ b/assets/urls.py
@@ -28,6 +28,8 @@ urlpatterns = [
          (views.SupplierCreate.as_view()), name='supplier_create'),
     path('supplier/<int:pk>/edit', permission_required_with_403('assets.change_supplier')
          (views.SupplierUpdate.as_view()), name='supplier_update'),
+    path('supplier/<str:pk>/history/', views.SupplierVersionHistory.as_view(),
+         name='supplier_history', kwargs={'model': models.Supplier}),
 
     path('supplier/search/', views.SupplierSearch.as_view(), name='supplier_search_json'),
 ]
diff --git a/assets/views.py b/assets/views.py
index a032718f..d01876f4 100644
--- a/assets/views.py
+++ b/assets/views.py
@@ -207,6 +207,9 @@ class SupplierUpdate(generic.UpdateView):
     form_class = forms.SupplierForm
     template_name = 'supplier_update.html'
 
+class SupplierVersionHistory(versioning.VersionHistory):
+    template_name = "asset_version_history.html"
+
 # TODO: Reduce SQL queries
 class AssetVersionHistory(versioning.VersionHistory):
     model = versioning.RIGSVersion