--- email_registration.module	2007-10-11 04:14:13.000000000 +0100
+++ email_registration.module	2007-10-16 09:41:59.000000000 +0100
@@ -32,14 +32,25 @@ function email_registration_user($op, &$
 function email_registration_form_alter($form_id, &$form) {
   switch ($form_id) {
     case 'user_register':
-      $form['name']['#type'] = 'hidden';
-      $form['name']['#value'] = user_password();
-      $form['mail']['#title'] = t('E-mail');
+      if (module_exists('profile')){
+        $form['account']['name']['#type'] = 'hidden';
+        $form['account']['name']['#value'] = user_password();
+        $form['account']['mail']['#title'] = t('E-mail');
+      } else {
+        $form['name']['#type'] = 'hidden';
+        $form['name']['#value'] = user_password();
+        $form['mail']['#title'] = t('E-mail');
+      }
       break;
 
     case 'user_pass':
-      $form['name']['#title'] = t('E-mail');
-	    $form['name']['#description'] = t('Enter your e-mail address. You\'ll be sent a new password immediately.');
+      if (module_exists('profile')){
+        $form['account']['name']['#title'] = t('E-mail');
+	$form['account']['name']['#description'] = t('Enter your e-mail address. You\'ll be sent a new password immediately.');
+      } else {
+        $form['name']['#title'] = t('E-mail');
+	$form['name']['#description'] = t('Enter your e-mail address. You\'ll be sent a new password immediately.');
+      }
       break;
 
     case 'user_login':