diff --git a/lib/access-context.js b/lib/access-context.js
index 0040020c..be291bfa 100644
--- a/lib/access-context.js
+++ b/lib/access-context.js
@@ -88,7 +88,9 @@ function AccessContext(context) {
   var token = this.accessToken || {};
 
   if (token.userId) {
-    this.addPrincipal(Principal.USER, token.userId);
+    var userPrincipalType =
+      (this.accessToken && this.accessToken.principalType) || Principal.USER;
+    this.addPrincipal(userPrincipalType, token.userId);
   }
   if (token.appId) {
     this.addPrincipal(Principal.APPLICATION, token.appId);