diff --git a/includes/theme.inc b/includes/theme.inc
index 3868334..f468692 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -2685,6 +2685,7 @@ function template_preprocess_region(&$variables) {
  * @see template_process_username()
  */
 function template_preprocess_username(&$variables) {
+  global $user;
   $account = $variables['account'];
 
   $variables['extra'] = '';
@@ -2712,7 +2713,7 @@ function template_preprocess_username(&$variables) {
   $variables['profile_access'] = user_access('access user profiles');
   $variables['link_attributes'] = array();
   // Populate link path and attributes if appropriate.
-  if ($variables['uid'] && $variables['profile_access']) {
+  if ($variables['uid'] && (($variables['uid'] == $user->uid) || ($variables['profile_access']))) {
     // We are linking to a local user.
     $variables['link_attributes'] = array('title' => t('View user profile.'));
     $variables['link_path'] = 'user/' . $variables['uid'];