--- role_subscription_user.module	2008-05-24 16:54:10.000000000 -0700
+++ role_subscription_user_new.module	2008-05-25 10:28:52.000000000 -0700
@@ -19,43 +19,54 @@ function role_subscription_user_menu($ma
     /**
      * My subscriptions user section
      */
-	
+
+  $allowed = array('authenticated user');
+  $valid = false;
+  if(user_access('access role_subscription')) {
+    $valid = TRUE;
+  }
+  foreach($user->roles as $role){
+    if(in_array($role, $allowed)) {
+      $valid=TRUE;
+    }
+  }
+
 	$items[] = array('path' => 'role_subscription/my_subscriptions',
 		'title' => t('Manage Subscriptions for '.$user->name),
 		'description' => t('Manage My Subscriptions.'),
 		'callback' => 'role_subscription_user_subscriptions_home',
-		'access' => user_access('access role_subscription') AND user_access('authenticated user'),
+		'access' => $valid,
 		'type' => MENU_NORMAL_ITEM
     );
 	   
 	$items[] = array('path' => 'role_subscription/my_subscriptions/list',
-      	'weight' => 0,
+    'weight' => 0,
 		'title' => t('List'),
-      	'callback' => 'role_subscription_user_subscriptions_home',
-      	'type' => MENU_DEFAULT_LOCAL_TASK,
-		'access' => user_access('access role_subscription') AND user_access('authenticated user'),
+    'callback' => 'role_subscription_user_subscriptions_home',
+    'type' => MENU_DEFAULT_LOCAL_TASK,
+		'access' => $valid,
     );
 	
 	$items[] = array('path' => 'role_subscription/my_subscriptions/payment/edit',
 		'title' => t('Edit My Subscription'),
-      	'callback' => 'drupal_get_form',
+    'callback' => 'drupal_get_form',
 		'callback arguments' => array('role_subscription_user_edit_subscription'),
-      	'type' => MENU_CALLBACK,
-		'access' => user_access('access role_subscription') AND user_access('authenticated user'),
+    'type' => MENU_CALLBACK,
+		'access' => $valid,
     );
     
     $items[] = array('path' => 'role_subscription/my_subscriptions/change',
 		'title' => t('Change My Subscription'),
-      	'callback' => 'drupal_get_form',
+    'callback' => 'drupal_get_form',
 		'callback arguments' => array('role_subscription_user_change_subscription'),
-      	'type' => MENU_CALLBACK,
-		'access' => user_access('access role_subscription') AND user_access('authenticated user'),
+    'type' => MENU_CALLBACK,
+		'access' => $valid,
     );
     
     $items[] = array('path' => 'role_subscription/my_subscriptions/cancel',
 		'title' => t('Cancel My Subscription'),
-      	'callback' => 'role_subscription_user_cancel_subscription',
-		'access' => user_access('access role_subscription') AND user_access('authenticated user'),
+    'callback' => 'role_subscription_user_cancel_subscription',
+		'access' => $valid,
 		'type' => MENU_CALLBACK
     );