diff --git content_profile_page.info content_profile_page.info
index a059d31..10fba79 100644
--- content_profile_page.info
+++ content_profile_page.info
@@ -2,4 +2,6 @@
 name = Content Profile Page
 description = Integrates content profiles with user pages.
 version = VERSION
+dependencies[] = content_profile
+package = "Content Profile"
 core = 6.x
diff --git content_profile_page.module content_profile_page.module
index 9a3c11b..801061b 100644
--- content_profile_page.module
+++ content_profile_page.module
@@ -32,7 +32,7 @@ function content_profile_page_menu_alter(&$callbacks) {
     // Set the profile's local task under the Edit tab as default.
     $edit = 'user/%user_category/edit';
     $account = 'user/%user_category/edit/account';
-    $type = 'user/%user_category/edit/'. $type;
+    $type = 'user/%user/profile/' . $type;
     $callbacks[$account] += $callbacks[$edit];
     $callbacks[$account]['type'] = MENU_LOCAL_TASK;
     $callbacks[$account]['weight'] = 32;
@@ -78,15 +78,12 @@ function content_profile_page_override_view($account) {
  * Access callback.
  */
 function content_profile_page_override_access($account) {
+  $node = content_profile_page_user_profile($account);
   // First check if the user has permission to view profiles at all.
-  $access = call_user_func_array('user_view_access', array($account));
-
-  // If we're viewing the profile node instead of the ordinary profile, check
-  // if the user also has permission to view the node.
-  if (($node = content_profile_page_user_profile($account)) && node_access('view', $node)) {
-    $access = ($access && call_user_func_array('node_access', array('view', $node)));
+  $access = user_view_access($account);
+  if($node) {
+    $access = ($access && node_access('view', $node));
   }
-
   return $access;
 }