diff --git a/machines/templates/machines/aff_machines.html b/machines/templates/machines/aff_machines.html
index 60e1a57a9acb3c58c9a05eb22ac3e19106581fda..d5a83ed3d43112f524c8b5319f9f07533e6c1ce9 100644
--- a/machines/templates/machines/aff_machines.html
+++ b/machines/templates/machines/aff_machines.html
@@ -28,7 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% if machines_list.paginator %}
- {% include "pagination.html" with list=machines_list %}
+ {% include "pagination.html" with list=machines_list go_to_id="machines" %}
{% endif %}
@@ -215,6 +215,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% if machines_list.paginator %}
- {% include "pagination.html" with list=machines_list %}
+ {% include "pagination.html" with list=machines_list go_to_id="machines" %}
{% endif %}
diff --git a/templates/pagination.html b/templates/pagination.html
index cf488c5d79f79e1a187fc4928ba98934a6181bf1..5ecced6d13667d2105d9fabd7631632352d205c9 100644
--- a/templates/pagination.html
+++ b/templates/pagination.html
@@ -23,23 +23,52 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% endcomment %}
{% load url_insert_param %}
+{% load i18n %}
{% if list.paginator.num_pages > 1 %}
-
+{% endif %}