diff --git a/include/staff/templates/users.tmpl.php b/include/staff/templates/users.tmpl.php
index 7d56f26ef739863fd02ec9ccfdfdd89c82b3d9ef..b34fa61111e05dac6726e6f379a1b67b6d88a83c 100644
--- a/include/staff/templates/users.tmpl.php
+++ b/include/staff/templates/users.tmpl.php
@@ -36,7 +36,10 @@ $pageNav=new Pagenate($total,$page,PAGE_LIMIT);
 $qstr = '&'. Http::build_query($qs);
 $qs += array('sort' => $_REQUEST['sort'], 'order' => $_REQUEST['order']);
 
-$pageNav->setURL('users.php', $qs);
+if (strpos($_SERVER['REQUEST_URI'], 'orgs.php') !== false)
+    $pageNav->setURL('orgs.php?id='.$org->getId().'&', $qs);
+else
+    $pageNav->setURL('users.php', $qs);
 //Ok..lets roll...create the actual query
 $qstr .= '&order='.($order=='DESC' ? 'ASC' : 'DESC');