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 f0b732eaf9..b1be5acde2 100644
--- a/drupal/sites/default/boinc/themes/boinc/templates/comment.tpl.php
+++ b/drupal/sites/default/boinc/themes/boinc/templates/comment.tpl.php
@@ -102,6 +102,12 @@
     ?>
     <div class="name"><?php print $author; ?></div>
     <?php if ($account->uid): ?>
+      <?php if (in_array('moderator', $account->roles)): ?>
+        <div class="moderator"><?php print bts('Moderator', array(), NULL, 'boinc:user-info'); ?></div>
+      <?php endif; ?>
+      <?php if (in_array('administrator', $account->roles)): ?>
+        <div class="administrator"><?php print bts('Administrator', array(), NULL, 'boinc:user-info'); ?></div>
+      <?php endif; ?>
       <?php $nf = new NumberFormatter($locality, NumberFormatter::DECIMAL); ;?>
       <?php $nf->setAttribute(NumberFormatter::MIN_FRACTION_DIGITS, 0); ;?>
       <?php $nf->setAttribute(NumberFormatter::MAX_FRACTION_DIGITS, 0); ;?>
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 111fc89acc..9d59e9ef48 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
@@ -157,6 +157,12 @@
       ?>
       <div class="name"><?php print $name; ?></div>
       <?php if ($account->uid): ?>
+      <?php if (in_array('moderator', $account->roles)): ?>
+        <div class="moderator"><?php print bts('Moderator', array(), NULL, 'boinc:user-info'); ?></div>
+      <?php endif; ?>
+      <?php if (in_array('administrator', $account->roles)): ?>
+        <div class="administrator"><?php print bts('Administrator', array(), NULL, 'boinc:user-info'); ?></div>
+      <?php endif; ?>
         <?php $nf = new NumberFormatter($locality, NumberFormatter::DECIMAL); ;?>
         <?php $nf->setAttribute(NumberFormatter::MIN_FRACTION_DIGITS, 0); ;?>
         <?php $nf->setAttribute(NumberFormatter::MAX_FRACTION_DIGITS, 0); ;?>
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 dd45b0fdfc..55acaa8583 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
@@ -173,6 +173,12 @@
       ?>
       <div class="name"><?php print $name; ?></div>
       <?php if ($account->uid): ?>
+        <?php if (in_array('moderator', $account->roles)): ?>
+          <div class="moderator"><?php print bts('Moderator', array(), NULL, 'boinc:user-info'); ?></div>
+        <?php endif; ?>
+        <?php if (in_array('administrator', $account->roles)): ?>
+          <div class="administrator"><?php print bts('Administrator', array(), NULL, 'boinc:user-info'); ?></div>
+        <?php endif; ?>
         <?php $nf = new NumberFormatter($locality, NumberFormatter::DECIMAL); ;?>
         <?php $nf->setAttribute(NumberFormatter::MIN_FRACTION_DIGITS, 0); ;?>
         <?php $nf->setAttribute(NumberFormatter::MAX_FRACTION_DIGITS, 0); ;?>