diff --git a/author-pane-user-picture.tpl.php b/author-pane-user-picture.tpl.php
index b972bd1..37bd1a1 100644
--- a/author-pane-user-picture.tpl.php
+++ b/author-pane-user-picture.tpl.php
@@ -22,7 +22,11 @@
 <?php if (!empty($picture)): ?>
   <div class="picture">
     <?php if ($imagecache_used): ?>
+    	<?php if (isset($account->picture)): // User has a picture, link to that. ?>
       <a href="<?php print file_create_url($account->picture->uri); ?>" rel="lightbox"><?php print $picture; ?></a>
+      <?php else: // User has no picture, link to the default user picture. ?>
+      <a href="<?php print file_create_url(variable_get('user_picture_default', '')); ?>" rel="lightbox"><?php print $picture; ?></a>
+      <?php endif; ?>
     <?php else: ?>
       <?php print $picture; ?>
     <?php endif; ?>