Index: roleassign.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/roleassign/roleassign.module,v
retrieving revision 1.15
diff -u -F^f -r1.15 roleassign.module
--- roleassign.module	24 Oct 2006 17:59:48 -0000	1.15
+++ roleassign.module	25 Oct 2006 00:06:32 -0000
@@ -148,8 +148,8 @@ function roleassign_form_alter($form_id,
 	if (!(user_access('administer users') && user_access('assign roles')))
 		return;
 
-	// Do nothing if user edit form isn't shown.
-	if ($form_id != 'user_edit' || !isset($form['account']))
+	// Do nothing unless either the user registration or the main user edit form is shown.
+	if ($form_id != 'user_register' && ($form_id != 'user_edit' || !isset($form['account'])))
 		return;
 
 	// Get all roles that are available.