diff --git a/content_profile.module b/content_profile.module
index fb1026d..8f7143b 100644
--- a/content_profile.module
+++ b/content_profile.module
@@ -84,7 +84,7 @@ function content_profile_page_access($type, $account) {
   // Else user may view the page when they are going to create their own profile
   // or have permission to create it for others.
   global $user;
-  if ($user->uid == $account->uid || user_access('administer nodes') ){
+  if ($user->uid == $account->uid || user_access('create '. $type .' content')){
     return node_access('create', $type);
   }
   return FALSE;
@@ -531,7 +531,7 @@ function content_profile_show_profiles($uid) {
       // Working around the bug described at http://drupal.org/node/302873
       module_load_include('inc', 'content_profile', 'content_profile.theme');
     }
-    elseif (user_access('create '. $type .' content') && content_profile_get_settings($type, 'add_link') && !$node && ($uid == $user->uid || user_access('administer nodes'))) {
+    elseif (user_access('create '. $type .' content') && content_profile_get_settings($type, 'add_link') && !$node)) {
       $content['content_profile_'. $type] = array(
         '#admin' => $uid != $user->uid,
         '#theme' => 'content_profile_display_add_link',