diff --git a/modules/og_views/includes/og_views_handler_field_og_managelink.inc b/modules/og_views/includes/og_views_handler_field_og_managelink.inc
index 2e0ff93..b22edb3 100644
--- a/modules/og_views/includes/og_views_handler_field_og_managelink.inc
+++ b/modules/og_views/includes/og_views_handler_field_og_managelink.inc
@@ -20,15 +20,12 @@ class og_views_handler_field_og_managelink extends og_views_handler_field_og_uid
       // Only show links to group admins. And don't show next to group manager.
       if ($uid != $node->uid) {
         if ($is_active) {
-          $item = menu_get_item("og/unsubscribe/$nid/$uid");
-          if ($item['access']) {
+          if (og_menu_access_unsubscribe($node, $uid)) {
             return l(t('Remove membership'), "og/unsubscribe/$nid/$uid", array('query' => drupal_get_destination()));
           }
         }
         else {
-          $token = og_get_token($nid);
-          $item = menu_get_item("og/approve/$nid/$uid/$token");
-          if ($item['access']) {
+          if (og_is_group_admin($node)) {
             return t('Request: <a href="@approve">approve</a> or <a href="@deny">deny</a>.', array('@approve' => url("og/approve/$nid/$uid/$token", array('query' => drupal_get_destination())), '@deny' => url("og/deny/$nid/$uid/$token", array('query' => drupal_get_destination()))));
           }
         }
diff --git a/modules/og_views/includes/og_views_handler_field_og_managelinkadmin.inc b/modules/og_views/includes/og_views_handler_field_og_managelinkadmin.inc
index 9c336f4..6640767 100644
--- a/modules/og_views/includes/og_views_handler_field_og_managelinkadmin.inc
+++ b/modules/og_views/includes/og_views_handler_field_og_managelinkadmin.inc
@@ -18,18 +18,12 @@ class og_views_handler_field_og_managelinkadmin extends og_views_handler_field_o
       $is_admin = $values->{$this->aliases['is_admin']};
       $node = node_load($nid);
       // Only show links to group admins. And don't show next to group manager.
-      if ($uid != $node->uid) {
+      if ($uid != $node->uid && og_is_group_admin($node)) {
         if ($is_admin) {
-          $item = menu_get_item("og/delete_admin/$nid/$uid");
-          if ($item['access']) {
-            return l(t('Admin: Remove'), "og/delete_admin/$nid/$uid", array('query' => drupal_get_destination()));
-          }
+          return l(t('Admin: Remove'), "og/delete_admin/$nid/$uid", array('query' => drupal_get_destination()));
         }
         else {
-          $item = menu_get_item("og/create_admin/$nid/$uid");
-          if ($item['access']) {
-            return l(t('Admin: Create'), "og/create_admin/$nid/$uid", array('query' => drupal_get_destination()));
-          }
+          return l(t('Admin: Create'), "og/create_admin/$nid/$uid", array('query' => drupal_get_destination()));
         }
       }
     }