diff --git a/preferences/templates/preferences/aff_radiuskey.html b/preferences/templates/preferences/aff_radiuskey.html
index 073aeea2..0d58efe3 100644
--- a/preferences/templates/preferences/aff_radiuskey.html
+++ b/preferences/templates/preferences/aff_radiuskey.html
@@ -22,6 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 {% endcomment %}
 {% load acl %}
+{% load logs_extra %}
     <table class="table table-striped">
         <thead>
             <tr>
@@ -48,7 +49,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 		   <i class="fa fa-trash"></i>
             </a>
             {% acl_end %}
-            {% include 'buttons/history.html' with href='preferences:history' name='radiuskey' id=radiuskey.id %}
+            {% history_button radiuskey %}
             </td>
         </tr>
         {% endfor %}
diff --git a/preferences/templates/preferences/aff_switchmanagementcred.html b/preferences/templates/preferences/aff_switchmanagementcred.html
index d69a287a..ef8b0143 100644
--- a/preferences/templates/preferences/aff_switchmanagementcred.html
+++ b/preferences/templates/preferences/aff_switchmanagementcred.html
@@ -22,6 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 {% endcomment %}
 {% load acl %}
+{% load logs_extra %}
     <table class="table table-striped">
         <thead>
             <tr>
@@ -46,7 +47,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
          	   <i class="fa fa-trash"></i>
             </a>
             {% acl_end %}
-            {% include 'buttons/history.html' with href='preferences:history' name='switchmanagementcred' id=switchmanagementcred.id %}
+            {% history_button switchmanagementcred %}
             </td>
         </tr>
         {% endfor %}
diff --git a/topologie/templates/topologie/aff_vlanoptions.html b/topologie/templates/topologie/aff_vlanoptions.html
index 7684e951..3810cb7f 100644
--- a/topologie/templates/topologie/aff_vlanoptions.html
+++ b/topologie/templates/topologie/aff_vlanoptions.html
@@ -23,6 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% endcomment %}
 
 {% load acl %}
+{% load logs_extra %}
 
 <div class="table-responsive">
     <table class="table table-striped">
@@ -51,7 +52,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 		{% can_edit vlan %}
                 {% include 'buttons/edit.html' with href='topologie:edit-vlanoptions' id=vlan.id %}
 		{% acl_end %}
-                {% include 'buttons/history.html' with href='machines:history' name='vlan' id=vlan.id %}
+                {% history_button vlan %}
             </td>
         </tr>
         {% endfor %}