diff --git a/config-templates/authsources.php b/config-templates/authsources.php
index 1370ffc36d0a0e884f7140a0cdb6748e0ebe4fb4..a8187f63781df96cf626b29cd15ed08a28c33650 100644
--- a/config-templates/authsources.php
+++ b/config-templates/authsources.php
@@ -53,6 +53,8 @@ $config = array(
 	
 	'openid' => array(
 		'openid:OpenIDConsumer',
+		'attributes.required' => array('nickname'),
+		'attributes.optional' => array('fullname', 'email',),
 	),
 
 	'feide' => array(
diff --git a/modules/openid/lib/Auth/Source/OpenIDConsumer.php b/modules/openid/lib/Auth/Source/OpenIDConsumer.php
index 0d42f83e0637d286c97ae61c21334d68ebf7245c..1d0c4de7b058dac19b2caf3e0f5c2c686a73abca 100644
--- a/modules/openid/lib/Auth/Source/OpenIDConsumer.php
+++ b/modules/openid/lib/Auth/Source/OpenIDConsumer.php
@@ -9,6 +9,17 @@
  */
 class sspmod_openid_Auth_Source_OpenIDConsumer extends SimpleSAML_Auth_Source {
 
+	/**
+	 * List of optional attributes.
+	 */
+	private $optionalAttributes;
+
+
+	/**
+	 * List of required attributes.
+	 */
+	private $requiredAttributes;
+
 
 	/**
 	 * Constructor for this authentication source.
@@ -21,6 +32,11 @@ class sspmod_openid_Auth_Source_OpenIDConsumer extends SimpleSAML_Auth_Source {
 		/* Call the parent constructor first, as required by the interface. */
 		parent::__construct($info, $config);
 
+		$cfgParse = SimpleSAML_Configuration::loadFromArray($config,
+			'Authentication source ' . var_export($this->authId, TRUE));
+
+		$this->optionalAttributes = $cfgParse->getArray('attributes.optional', array());
+		$this->requiredAttributes = $cfgParse->getArray('attributes.required', array());
 	}
 
 
@@ -40,6 +56,26 @@ class sspmod_openid_Auth_Source_OpenIDConsumer extends SimpleSAML_Auth_Source {
 		SimpleSAML_Utilities::redirect($url, array('AuthState' => $id));
 	}
 
+
+	/**
+	 * Retrieve required attributes.
+	 *
+	 * @return array  Required attributes.
+	 */
+	public function getRequiredAttributes() {
+		return $this->requiredAttributes;
+	}
+
+
+	/**
+	 * Retrieve optional attributes.
+	 *
+	 * @return array  Optional attributes.
+	 */
+	public function getOptionalAttributes() {
+		return $this->optionalAttributes;
+	}
+
 }
 
 ?>
\ No newline at end of file
diff --git a/modules/openid/www/consumer.php b/modules/openid/www/consumer.php
index f0ca314f939ef1d745e424359a48c7f05f78cd70..a808841c6a039e005b7f748dd6a7f7d9067913a9 100644
--- a/modules/openid/www/consumer.php
+++ b/modules/openid/www/consumer.php
@@ -88,6 +88,8 @@ function getTrustRoot() {
 }
 
 function run_try_auth() {
+    global $authSource;
+
     $openid = getOpenIDURL();
     $consumer = getConsumer();
 
@@ -100,8 +102,8 @@ function run_try_auth() {
     }
 
     $sreg_request = Auth_OpenID_SRegRequest::build(
-			array('nickname'), // Required
-			array('fullname', 'email')); // Optional
+			$authSource->getRequiredAttributes(),
+			$authSource->getOptionalAttributes());
 
     if ($sreg_request) {
         $auth_request->addExtension($sreg_request);