diff --git a/group.php b/group.php
index 1fc69570f..1b08318f3 100644
--- a/group.php
+++ b/group.php
@@ -376,10 +376,10 @@ if (!$group_id) {
         'MOD_EMAIL' => $moderator_info['email'],
         'MOD_WWW' => $moderator_info['www'],
         'MOD_TIME' => (!empty($group_info['mod_time'])) ? bb_date($group_info['mod_time']) : $lang['NONE'],
-        'U_SEARCH_USER' => "search.php?mode=searchuser",
+        'U_SEARCH_USER' => 'search.php?mode=searchuser',
         'U_SEARCH_RELEASES' => "tracker.php?srg=$group_id",
-        'U_GROUP_RELEASES' => "group.php?view=releases&" . POST_GROUPS_URL . "=$group_id",
-        'U_GROUP_MEMBERS' => "group.php?view=members&" . POST_GROUPS_URL . "=$group_id",
+        'U_GROUP_RELEASES' => GROUP_URL . $group_id . "&view=releases",
+        'U_GROUP_MEMBERS' => GROUP_URL . $group_id . "&view=members",
         'U_GROUP_CONFIG' => "group_edit.php?g=$group_id",
         'RELEASE_GROUP' => (bool)$group_info['release_group'],
         'GROUP_TYPE' => $group_type,
@@ -394,7 +394,7 @@ if (!$group_id) {
         'S_MODE_SELECT' => $select_sort_mode,
         'S_ORDER_SELECT' => $select_sort_order,
 
-        'S_GROUP_ACTION' => "group.php?" . POST_GROUPS_URL . "=$group_id",
+        'S_GROUP_ACTION' => GROUP_URL . $group_id,
     ]);
 
     switch ($view_mode) {
diff --git a/library/ajax/index_data.php b/library/ajax/index_data.php
index 5d470571d..6c96f1a66 100644
--- a/library/ajax/index_data.php
+++ b/library/ajax/index_data.php
@@ -72,7 +72,7 @@ switch ($mode) {
 
         if (isset($mod['mod_groups'][$forum_id])) {
             foreach ($mod['mod_groups'][$forum_id] as $group_id) {
-                $moderators[] = '<a href="' . "group.php?" . POST_GROUPS_URL . "=" . $group_id . '">' . $mod['name_groups'][$group_id] . '</a>';
+                $moderators[] = '<a href="' . GROUP_URL . $group_id . '">' . $mod['name_groups'][$group_id] . '</a>';
             }
         }