Fix form element loading.

main/admin/user_add.php

@@ -236,7 +236,7 @@ $form->addElement('radio', 'radio_expiration_date', get_lang('ExpirationDate'),
 $group = array ();
 $group[] = $form->createElement('radio', 'radio_expiration_date', null, get_lang('On'), 1);
 $group[] = $form->createElement(
-    'date',
+    'DatePicker',
     'expiration_date',
     null,
     array(

main/admin/user_edit.php

@@ -272,7 +272,7 @@ if (!$user_data['platform_admin']) {
 	$form->addElement('radio', 'radio_expiration_date', get_lang('ExpirationDate'), get_lang('NeverExpires'), 0);
 	$group = array ();
 	$group[] = $form->createElement('radio', 'radio_expiration_date', null, get_lang('On'), 1);
-	$group[] = $form->createElement('date', 'expiration_date', null, array('onchange' => 'javascript: enable_expiration_date();'));
+	$group[] = $form->createElement('DatePicker', 'expiration_date', null, array('onchange' => 'javascript: enable_expiration_date();'));
 	$form->addGroup($group, 'max_member_group', null, '', false);
 
 	// Active account or inactive account

main/inc/lib/pear/HTML/QuickForm.php

@@ -584,6 +584,8 @@ class HTML_QuickForm extends HTML_Common
                     }
                 }
             }
+        } else {
+            $className = $type;
         }
 
         if (empty($className)) {