Index: avatar_selection.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/avatar_selection/avatar_selection.module,v
retrieving revision 1.1.2.20.2.26
diff -u -p -r1.1.2.20.2.26 avatar_selection.module
--- avatar_selection.module 30 Jun 2008 23:52:05 -0000 1.1.2.20.2.26
+++ avatar_selection.module 1 Jul 2008 13:42:03 -0000
@@ -235,7 +235,12 @@ function avatar_selection_user($op, &$ed
         $form_values['picture'] = $path . $edit['select_avatar'];
       }
       else if (!$file && variable_get('avatar_selection_set_random_default', FALSE)) {
-        $form_values['picture'] = avatar_selection_get_random_image($user);
+        if ($user->picture) {
+          $form_values['picture'] = $user->picture;
+        }
+        else {
+          $form_values['picture'] = avatar_selection_get_random_image($user);
+        }
       }
       break;
   }