--- modules/og/contrib/og_mandatory_group/og_mandatory_group.module.orig	Thu Apr  6 05:02:49 2006
+++ modules/og/contrib/og_mandatory_group/og_mandatory_group.module	Fri Apr 28 23:30:52 2006
@@ -29,7 +29,7 @@ function og_mandatory_group_user($op, &$
         $headers = "From: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from";
 
         $registered = array(0);
-        foreach ($edit['og_register'] as $key => $value) {
+        if ($edit['og_register']) {
           $registered[] = ($value ? $key : 0);
         }
         $result = db_query('SELECT n.nid, n.title, o.selective FROM {node} n INNER JOIN {og} o ON n.nid = o.nid WHERE n.nid IN (%s) ORDER BY n.title', implode(',', $registered));
@@ -59,7 +59,7 @@ function og_mandatory_group_user($op, &$
             if (strlen($groups)) {
               $body .= "\n". t('The user also subscribed to the following groups:') ."\n\n". $groups;
             }
-            if (user_access('administer users', $row)) {
+            if (user_access('administer users', user_load(array('uid' => $row->uid)))) {
               $body .= "\n". t('You may manage this user at %url', array('%url' => url("user/$account->uid/edit", NULL, NULL, TRUE)));
             }
             user_mail($row->mail, $subj, $body, $headers);