diff --git a/og_forum.module b/og_forum.module
index 72f734b..bd49552 100644
--- a/og_forum.module
+++ b/og_forum.module
@@ -256,6 +256,7 @@ function og_forum_menu() {
       'title' => 'Edit container',
       'page callback' => 'og_forum_form_main',
       'page arguments' => array(1, 2, 'container', 7),
+      'access callback' => 'og_user_access',
       'access arguments' => array(1, 2, 'administer forums'),
       'file' => 'og_forum.pages.inc',
     );
@@ -263,6 +264,7 @@ function og_forum_menu() {
       'title' => 'Edit forum',
       'page callback' => 'og_forum_form_main',
       'page arguments' => array(1, 2, 'forum', 7),
+      'access callback' => 'og_user_access',
       'access arguments' => array(1, 2, 'administer forums'),
       'file' => 'og_forum.pages.inc',
     );
diff --git a/og_forum.pages.inc b/og_forum.pages.inc
index d960e99..1af5a3b 100644
--- a/og_forum.pages.inc
+++ b/og_forum.pages.inc
@@ -175,6 +175,7 @@ function og_forum_overview($form, &$form_state, $group_type, $gid) {
         '#default_value' => $term->weight,
       );
     }
+    $form[$key]['edit'] = array('#type' => 'link', '#options' => array('query' => drupal_get_destination()));
     if (in_array($term->tid, variable_get('forum_containers', array()))) {
       $form[$key]['edit']['#title'] = t('edit container');
       $form[$key]['edit']['#href'] = $og_forum_path . 'edit/container/' . $term->tid;