diff --git a/modules/oauth/www/authorize.php b/modules/oauth/www/authorize.php
index ed92f146047b190c1232d1b595e6cc73433dff0e..b8e5bf3b77df72c2cbf044383a5cfa3a2eaddb36 100644
--- a/modules/oauth/www/authorize.php
+++ b/modules/oauth/www/authorize.php
@@ -48,7 +48,7 @@ try {
 		exit();	// and be done.
 	}
 
-	$attributes = $session->getAttributes();
+	$attributes = $session->getAuthData($as, 'Attributes');
 
 	// Assume user consent at this point and proceed with authorizing the token
 	list($url, $verifier) = $store->authorize($requestToken, $attributes);
diff --git a/modules/oauth/www/registry.edit.php b/modules/oauth/www/registry.edit.php
index 972e1046158269c1707d0850d929d66d0b59514a..1b752cdc7c14c1d52ea9182a05009126b925781f 100644
--- a/modules/oauth/www/registry.edit.php
+++ b/modules/oauth/www/registry.edit.php
@@ -13,7 +13,7 @@ $useridattr = $oauthconfig->getValue('useridattr', 'user');
 //$useridattr = $oauthconfig->getValue('useridattr', 'uid');
 
 if ($session->isValid($authsource)) {
-	$attributes = $session->getAttributes();
+	$attributes = $session->getAuthData($authsource, 'Attributes');
 	// Check if userid exists
 	if (!isset($attributes[$useridattr])) 
 		throw new Exception('User ID is missing');
diff --git a/modules/oauth/www/registry.php b/modules/oauth/www/registry.php
index c7ac52c7f2ef886e3e34e954a391a0d48f29b0f1..52b06f2e1b7f054c679ef8daeb866737e213b746 100644
--- a/modules/oauth/www/registry.php
+++ b/modules/oauth/www/registry.php
@@ -13,7 +13,7 @@ $useridattr = $oauthconfig->getValue('useridattr', 'user');
 //$useridattr = $oauthconfig->getValue('useridattr', 'uid');
 
 if ($session->isValid($authsource)) {
-	$attributes = $session->getAttributes();
+	$attributes = $session->getAuthData($authsource, 'Attributes');
 	// Check if userid exists
 	if (!isset($attributes[$useridattr])) 
 		throw new Exception('User ID is missing');