diff --git a/tag/index.php b/tag/index.php
index bbf5261379d..334ae57bac1 100644
--- a/tag/index.php
+++ b/tag/index.php
@@ -143,9 +143,10 @@ if ($usercount > 0) {
     echo "<a name='user'></a>";
     echo $OUTPUT->heading($heading, 3);
 
-    $baseurl = $CFG->wwwroot.'/tag/index.php?id=' . $tag->id;
-
-    print_paging_bar($usercount, $userpage, $perpage, $baseurl.'&amp;', 'userpage');
+    $baseurl = new moodle_url($CFG->wwwroot.'/tag/index.php', array('id' => $tag->id));
+    $pagingbar = moodle_paging_bar::make($totalcount, $page, $perpage, $baseurl);
+    $pagingbar->pagevar = 'userpage';
+    echo $OUTPUT->paging_bar($pagingbar);
     tag_print_tagged_users_table($tag, $userpage * $perpage, $perpage);
     print_box_end();
 }
diff --git a/tag/locallib.php b/tag/locallib.php
index 7011218a7c3..ac58e3b9c9c 100644
--- a/tag/locallib.php
+++ b/tag/locallib.php
@@ -266,7 +266,7 @@ function tag_print_search_results($query,  $page, $perpage, $return=false) {
         $output .= '</ul>';
         $output .= '<div>&nbsp;</div>'; // <-- small layout hack in order to look good in Firefox
 
-        $output .= print_paging_bar($count, $page, $perpage, $baseurl .'&amp;', 'page', false, true);
+        $output .= $OUTPUT->paging_bar(moodle_paging_bar::make($count, $page, $perpage, $baseurl));
     }
     else { //no results were found!!
         $output .= $OUTPUT->heading(get_string('noresultsfor', 'tag', htmlspecialchars($query)), 3, 'main');