diff --git a/avatar_selection.module b/avatar_selection.module
index ce1a2c2..2f2b6f3 100755
--- a/avatar_selection.module
+++ b/avatar_selection.module
@@ -181,7 +181,7 @@ function avatar_selection_form_user_register_alter(&$form, $form_state, $form_id
   if (count($selects['avatars'])) {
     drupal_add_css(drupal_get_path('module', 'avatar_selection') .'/avatar_selection.css');
     $upload = 1;
-    if (!is_array($form['picture'])) {
+    if (empty ($form['picture']) || !is_array($form['picture'])) {
       $upload = 0; // I.e. Not provided by "register with picture" contributed module.
       $form['picture'] = array(
         '#type' => 'fieldset',