Index: src/main/java/com/xpn/xwiki/plugin/spacemanager/impl/SpaceManagerImpl.java
===================================================================
--- src/main/java/com/xpn/xwiki/plugin/spacemanager/impl/SpaceManagerImpl.java	(revision 7788)
+++ src/main/java/com/xpn/xwiki/plugin/spacemanager/impl/SpaceManagerImpl.java	(working copy)
@@ -1591,12 +1591,12 @@
 			toUsers = (String[]) admins.toArray(new String[admins.size()]);
 		} else if (SpaceAction.JOIN.equals(action)) {
 			// send join group confirmation e-mail
-            SpaceUserProfile profile =
-                getSpaceUserProfile(space.getSpaceName(), context.getUser(), context);
-            if (profile != null && profile.getAllowNotifications()) {
+            boolean optOutEmail =
+                context.getWiki().getUserPreferenceAsInt("opt_out", context) != 0;
+            if (optOutEmail) {
+                return;
+            } else {
                 toUsers = new String[] {context.getUser()};
-            } else {
-                return;
             }
 		}