Index: C:/home/jkoz/java/liferay44/portal/portal-impl/src/com/liferay/portal/service/impl/OrganizationLocalServiceImpl.java
===================================================================
--- C:/home/jkoz/java/liferay44/portal/portal-impl/src/com/liferay/portal/service/impl/OrganizationLocalServiceImpl.java	(revision 14231)
+++ C:/home/jkoz/java/liferay44/portal/portal-impl/src/com/liferay/portal/service/impl/OrganizationLocalServiceImpl.java	(working copy)
@@ -45,6 +45,7 @@
 import com.liferay.portal.service.base.OrganizationLocalServiceBaseImpl;
 import com.liferay.portal.util.PropsValues;
 import com.liferay.portal.util.comparator.OrganizationNameComparator;
+import com.liferay.portlet.admin.util.OmniadminUtil;
 import com.liferay.util.UniqueList;
 
 import java.rmi.RemoteException;
@@ -129,9 +130,11 @@
 			userId, group.getGroupId(), new long[] {role.getRoleId()});
 
 		// User
+        // If user adding organization is omni-admin, don't make them a member...
+        if (!OmniadminUtil.isOmniadmin(userId)) {
+		    userPersistence.addOrganization(userId, organizationId);
+        }
 
-		userPersistence.addOrganization(userId, organizationId);
-
 		// Resources
 
 		addOrganizationResources(userId, organization);