diff --git a/adapters/jboss/src/main/java/org/acegisecurity/adapters/jboss/JbossAcegiLoginModule.java b/adapters/jboss/src/main/java/org/acegisecurity/adapters/jboss/JbossAcegiLoginModule.java
index 7cafa95f95..2b0cfea4d8 100644
--- a/adapters/jboss/src/main/java/org/acegisecurity/adapters/jboss/JbossAcegiLoginModule.java
+++ b/adapters/jboss/src/main/java/org/acegisecurity/adapters/jboss/JbossAcegiLoginModule.java
@@ -15,6 +15,11 @@
 
 package org.acegisecurity.adapters.jboss;
 
+import org.apache.commons.lang.ArrayUtils;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 import org.acegisecurity.AccountExpiredException;
 import org.acegisecurity.Authentication;
 import org.acegisecurity.AuthenticationException;
@@ -75,8 +80,8 @@ public class JbossAcegiLoginModule extends AbstractServerLoginModule {
     }
 
     protected Group[] getRoleSets() throws LoginException {
-        SimpleGroup roles = new SimpleGroup("Roles");
-        Group[] roleSets = {roles};
+        Group roles = new SimpleGroup("Roles");
+        Group callerPrincipalGroup = new SimpleGroup("CallerPrincipal");
 
         if (this.identity instanceof Authentication) {
             Authentication user = (Authentication) this.identity;
@@ -86,7 +91,9 @@ public class JbossAcegiLoginModule extends AbstractServerLoginModule {
             }
         }
 
-        return roleSets;
+        callerPrincipalGroup.addMember(getIdentity());
+
+        return new Group[] {roles, callerPrincipalGroup};
     }
 
     protected String[] getUsernameAndPassword() throws LoginException {
diff --git a/adapters/jboss/src/test/java/org/acegisecurity/adapters/jboss/JbossAcegiLoginModuleTests.java b/adapters/jboss/src/test/java/org/acegisecurity/adapters/jboss/JbossAcegiLoginModuleTests.java
index b6f3bd98d3..8dd93d3bb6 100644
--- a/adapters/jboss/src/test/java/org/acegisecurity/adapters/jboss/JbossAcegiLoginModuleTests.java
+++ b/adapters/jboss/src/test/java/org/acegisecurity/adapters/jboss/JbossAcegiLoginModuleTests.java
@@ -20,6 +20,7 @@ import junit.framework.TestCase;
 import org.acegisecurity.adapters.PrincipalAcegiUserToken;
 
 import org.jboss.security.SimplePrincipal;
+import org.jboss.security.SimpleGroup;
 
 import java.io.IOException;
 
@@ -27,6 +28,7 @@ import java.security.Principal;
 import java.security.acl.Group;
 
 import java.util.Properties;
+import java.util.Enumeration;
 
 import javax.security.auth.Subject;
 import javax.security.auth.callback.Callback;
@@ -318,11 +320,23 @@ public class JbossAcegiLoginModuleTests extends TestCase {
         assertTrue(adapter.login());
 
         Group[] result = adapter.getRoleSets();
-        assertEquals(1, result.length); // SimpleGroup called "Roles"
+        // Expect Roles and CallerPrincipal groups.
+        assertEquals(2, result.length);
 
         Group roles = result[0];
         assertTrue(roles.isMember(new SimplePrincipal("ROLE_TELLER")));
         assertTrue(roles.isMember(new SimplePrincipal("ROLE_SUPERVISOR")));
+
+        Group callerPrincipalGroup = result[1];
+        // check the name
+        assertTrue(callerPrincipalGroup.equals(new SimpleGroup("CallerPrincipal")));
+        Enumeration members = callerPrincipalGroup.members();
+        assertTrue("CallerPrincipal group must have exactly one member", members.hasMoreElements());
+        Principal principal = (Principal) members.nextElement();
+        if (!(principal instanceof PrincipalAcegiUserToken)) {
+            fail("Should have returned PrincipalAcegiUserToken");
+        }
+        assertTrue("CallerPrincipal group must have exactly one member", !members.hasMoreElements());
     }
 
     //~ Inner Classes ==================================================================================================
@@ -337,7 +351,6 @@ public class JbossAcegiLoginModuleTests extends TestCase {
         }
 
         private MockCallbackHandler() {
-            super();
         }
 
         public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {