diff --git a/token.tokens.inc b/token.tokens.inc
index f584bda..f1ba8cb 100644
--- a/token.tokens.inc
+++ b/token.tokens.inc
@@ -193,7 +193,7 @@ function token_token_info() {
     'restricted' => TRUE,
     // 'type' => 'url',
   );
-  if (variable_get('user_pictures', 0)) {
+  if (variable_get('user_pictures', 1)) {
     $info['tokens']['user']['picture'] = array(
       'name' => t('Picture'),
       'description' => t('The picture of the user.'),
@@ -561,7 +561,7 @@ function token_tokens($type, $tokens, array $data = array(), array $options = ar
     foreach ($tokens as $name => $original) {
       switch ($name) {
         case 'picture':
-          if (variable_get('user_pictures', 0)) {
+          if (variable_get('user_pictures', 1)) {
             $replacements[$original] = theme('user_picture', array('account' => $account));
           }
           break;
@@ -575,7 +575,7 @@ function token_tokens($type, $tokens, array $data = array(), array $options = ar
     }
 
     // Chained token relationships.
-    if (variable_get('user_pictures', 0) && !empty($account->picture) && ($picture_tokens = token_find_with_prefix($tokens, 'picture'))) {
+    if (variable_get('user_pictures', 1) && !empty($account->picture) && ($picture_tokens = token_find_with_prefix($tokens, 'picture'))) {
       // @todo Remove when core bug http://drupal.org/node/978028 is fixed.
       $account->picture->description = '';
       $replacements += token_generate('file', $picture_tokens, array('file' => $account->picture), $options);