diff --git a/drupal/sites/default/boinc/modules/boincteam/boincteam.module b/drupal/sites/default/boinc/modules/boincteam/boincteam.module
index 650ce7b633..763aad25d1 100644
--- a/drupal/sites/default/boinc/modules/boincteam/boincteam.module
+++ b/drupal/sites/default/boinc/modules/boincteam/boincteam.module
@@ -796,8 +796,13 @@ function boincteam_create_team_link_panel() {
   $output .= '  <li class="first last tab">';
   if (isset($account->roles[$unrestricted_role])) {
     $output .= l(bts('Create new team'), 'community/teams/add');
-  }
-  else {
+  } elseif ($account->uid <= 0) {
+    $output .= l(
+      bts('Login to create a new team'),
+      'user/login',
+      array('query' => drupal_get_destination())
+    );
+  } else {
     $min_credit_needed = variable_get('boinc_comment_min_credit', 0);
     $credit_needed = $min_credit_needed - $account->boincuser_total_credit;
     $output .= '[';
diff --git a/drupal/sites/default/boinc/themes/boinc/templates/comment.tpl.php b/drupal/sites/default/boinc/themes/boinc/templates/comment.tpl.php
index ed5c4af958..d287151a8c 100644
--- a/drupal/sites/default/boinc/themes/boinc/templates/comment.tpl.php
+++ b/drupal/sites/default/boinc/themes/boinc/templates/comment.tpl.php
@@ -109,9 +109,12 @@
           $ignore_link['ignore_user']['href'],
           array('query' => $ignore_link['ignore_user']['query'])); ?>
         </div>
-        <div class="pm-link"><?php print l(bts('Send message'),
-          privatemsg_get_link(array($account)),
-          array('query' => drupal_get_destination())); ?>
+        <div class="pm-link"><?php
+          if ($user->uid AND ($user->uid != $account->uid)) {
+            print l(bts('Send message'),
+            privatemsg_get_link(array($account)),
+            array('query' => drupal_get_destination()));
+          } ?>
         </div>
       </div>
     <?php endif; ?>
@@ -177,4 +180,4 @@
 
 <?php if ($status == 'comment-preview'): ?>
   <h2 class="title"><?php print bts('Revise or post comment'); ?></h2>
-<?php endif; ?>
\ No newline at end of file
+<?php endif; ?>
diff --git a/drupal/sites/default/boinc/themes/boinc/templates/node-forum.tpl.php b/drupal/sites/default/boinc/themes/boinc/templates/node-forum.tpl.php
index 1e18e9ba15..2791f4d5e4 100644
--- a/drupal/sites/default/boinc/themes/boinc/templates/node-forum.tpl.php
+++ b/drupal/sites/default/boinc/themes/boinc/templates/node-forum.tpl.php
@@ -154,9 +154,12 @@
             $ignore_link['ignore_user']['href'],
             array('query' => $ignore_link['ignore_user']['query'])); ?>
           </div>
-          <div class="pm-link"><?php print l(bts('Send message'),
-            privatemsg_get_link(array($account)),
-            array('query' => drupal_get_destination())); ?>
+          <div class="pm-link"><?php
+            if ($user->uid AND ($user->uid != $account->uid)) {
+              print l(bts('Send message'),
+              privatemsg_get_link(array($account)),
+              array('query' => drupal_get_destination()));
+            } ?>
           </div>
         </div>
       <?php endif; ?>
diff --git a/drupal/sites/default/boinc/themes/boinc/templates/node-team_forum.tpl.php b/drupal/sites/default/boinc/themes/boinc/templates/node-team_forum.tpl.php
index f18cfc54e8..d957dcb8bf 100644
--- a/drupal/sites/default/boinc/themes/boinc/templates/node-team_forum.tpl.php
+++ b/drupal/sites/default/boinc/themes/boinc/templates/node-team_forum.tpl.php
@@ -150,9 +150,12 @@
             $ignore_link['ignore_user']['href'],
             array('query' => $ignore_link['ignore_user']['query'])); ?>
           </div>
-          <div class="pm-link"><?php print l(bts('Send message'),
-            privatemsg_get_link(array($account)),
-            array('query' => drupal_get_destination())); ?>
+          <div class="pm-link"><?php
+            if ($user->uid AND ($user->uid != $account->uid)) {
+              print l(bts('Send message'),
+              privatemsg_get_link(array($account)),
+              array('query' => drupal_get_destination()));
+            } ?>
           </div>
         </div>
       <?php endif; ?>