diff --git a/domain_conf/domain_conf.admin.inc b/domain_conf/domain_conf.admin.inc
index 0df7c70..1520d18 100644
--- a/domain_conf/domain_conf.admin.inc
+++ b/domain_conf/domain_conf.admin.inc
@@ -56,6 +56,11 @@ function domain_conf_form($form, &$form_state, $domain) {
     $permission = isset($action['#permission']) ? $action['#permission'] : 'administer domains';
     $collapsed = isset($action['#collapsed']) ? $action['#collapsed'] : FALSE;
     if (!user_access($permission) || $action['#domain_action'] != 'domain_conf') {
+      // If the current user is assigned to this domain, then also test the
+      // specified permission 'for assigned domains' before continuing.
+      if ((!array_key_exists($domain['domain_id'], $user->domain_user)) || !user_access($permission . ' for assigned domains')) {
+        continue;
+      }
       continue;
     }
     if ($action['#form']['#type'] == 'select') {