Index: force_password_change.module
===================================================================
--- force_password_change.module	(revision 147)
+++ force_password_change.module	(working copy)
@@ -312,12 +312,18 @@
 	}
 	if($form_id == 'user_register')
 	{
-		$form['account']['name']['#weight'] = -2;
-		$form['account']['mail']['#weight'] = -1;
-		$form['account']['password']['#weight'] = -1;
-		$form['account']['password']['pass'] = $form['account']['pass'];
-		$form['account']['password']['force_password_change'] = $form['force_password_change'];
-		unset($form['account']['pass']);
+    if ($form['account']) {
+      $use_form = &$form['account'];
+    }
+    else {
+      $use_form = &$form;
+    }
+		$use_form['name']['#weight'] = -2;
+		$use_form['mail']['#weight'] = -1;
+		$use_form['password']['#weight'] = -1;
+		$use_form['password']['pass'] = $form['account']['pass'];
+		$use_form['password']['force_password_change'] = $form['force_password_change'];
+		unset($use_form['pass']);
 		unset($form['force_password_change']);
 	}
 }