diff -upr content_profile/content_profile.module content_profile_new/content_profile.module
--- content_profile/content_profile.module	2009-01-07 12:20:00.000000000 +0100
+++ content_profile_new/content_profile.module	2009-01-07 16:05:21.000000000 +0100
@@ -363,7 +363,7 @@ function _content_profile_node_delete($n
 function content_profile_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) {
   global $last_nid;
 
-  if ($op == 'prepare' && is_content_profile($node) && !isset($node->nid) && $node->uid && !user_access('administer nodes')) {
+  if ($op == 'prepare' && is_content_profile($node) && !isset($node->nid) && $node->uid && !user_access('administer nodes') && arg(2).arg(3)!="usercreate") {
     // Check if this nodetype already exists
     if ($nid = content_profile_profile_exists($node, $node->uid)) {
       // This node already exists, redirect to edit page
diff -upr content_profile/modules/content_profile_registration.module content_profile_new/modules/content_profile_registration.module
--- content_profile/modules/content_profile_registration.module	2008-11-04 04:52:00.000000000 +0100
+++ content_profile_new/modules/content_profile_registration.module	2009-01-07 16:36:00.000000000 +0100
@@ -10,12 +10,11 @@
  * Implementation of hook_form_alter().
  */
 function content_profile_registration_form_alter(&$form, &$form_state, $form_id) {
-  // Note: We don't add the registration form to the admin create user form.
-  if ($form_id == 'user_register' && module_exists('content') && arg(0) != 'admin') {
+ if ($form_id == 'user_register' && module_exists('content')) {
     require_once drupal_get_path('module', 'node') .'/node.pages.inc';
-    $profile_types = content_profile_get_types('names', 'registration_use');
+	if(arg(0)!='admin') $profile_types = content_profile_get_types('names', 'registration_use');
+	else $profile_types = content_profile_get_types('names', 'user_create_use');
     $form += array('#field_info' => array());
-
     foreach ($profile_types as $type => $typename) {
       // Initialize new node:
       $node = array('uid' => 0, 'name' => '', 'type' => $type);
@@ -65,11 +64,18 @@ function content_profile_registration_fo
         '#description' => t('Use this content type on the user registration page'),
         '#default_value' => content_profile_get_settings($type, 'registration_use'),
       );
+      $form['registration']['user_create_use'] = array(
+        '#type' => 'checkbox',
+        '#title' => t('Use on Create new user'),
+        '#description' => t('Use this content type when an admin creates a new user'),
+        '#default_value' => content_profile_get_settings($type, 'user_create_use'),
+      );      
       $options = _content_profile_registration_get_field_select($type, FALSE);
       if (!empty($options)) {
         $form['registration']['registration_hide'] = array(
           '#type' => 'checkboxes',
-          '#title' => t('Hide these fields during registration'),
+          '#title' => t('Hide these fields during registration and user creation'),
+          '#description' => t('If required fields are hidden, the user have to fill them out when first editing the profile'),          
           '#options' => $options,
           '#default_value' => content_profile_get_settings($type, 'registration_hide'),
         );
@@ -111,9 +117,9 @@ function _content_profile_registration_g
   $fields = _content_profile_registration_get_fields($type);
   $return = array();
   foreach ($fields as $fieldname => $info) {
-    if (!isset($required) || $required == $info['required']) {
-      $return[$fieldname] = $info['widget']['label'];
-    }
+  	$asterix = NULL;
+    if (!isset($required) || $required == $info['required']) $asterix = " <span class='form-required'>*</a>";
+    $return[$fieldname] = $info['widget']['label'].$asterix;
   }
 
   if (module_exists('fieldgroup')) {
@@ -130,7 +136,9 @@ function _content_profile_registration_g
  * Validates the user registration form
  */
 function content_profile_registration_user_register_validate($form, &$form_state) {
-  foreach (content_profile_get_types('names', 'registration_use') as $type => $typename) {
+  if(arg(0)!='admin') $profile_types = content_profile_get_types('names', 'registration_use');
+  else $profile_types = content_profile_get_types('names', 'user_create_use');
+  foreach ($profile_types as $type => $typename) {
     $node = new StdClass;
     $node->type = $type;
 
@@ -146,7 +154,9 @@ function content_profile_registration_us
  * Submits the user registration form
  */
 function content_profile_registration_user_register_submit($form, &$form_state) {
-  foreach (content_profile_get_types('names', 'registration_use') as $type => $typename) {
+  if(arg(0)!='admin') $profile_types = content_profile_get_types('names', 'registration_use');
+  else $profile_types = content_profile_get_types('names', 'user_create_use');
+  foreach ($profile_types as $type => $typename) {
     if ($node = &$form_state['content_profile_registration'][$type]['node']) {
       // Set user's information for the node.
       $node->title = $form_state['user']->name;
@@ -170,6 +180,7 @@ function content_profile_registration_us
 function content_profile_registration_content_profile_settings() {
   return array(
     'registration_use' => FALSE,
+    'user_create_use' => FALSE,    
     'registration_hide' => array(),
   );
 }