diff --git a/config-templates/config.php b/config-templates/config.php
index cd7276d184fb4ed39ea31e4f122e7f39d99507f3..455b7d5ceb15e4afe1848a6e2bd2d0974f2e008d 100644
--- a/config-templates/config.php
+++ b/config-templates/config.php
@@ -28,7 +28,7 @@ $config = array (
 	'certdir'               => 'cert/',
 	'dictionarydir'         => 'dictionaries/',
 	'loggingdir'            => 'log/',
-	
+	'libextinc'				=> 'libextinc/',
 	
 	'version'				=>	'trunk',
 	
@@ -189,6 +189,11 @@ $config = array (
 	 * Whether the discovery service should allow the user to save his choice of IdP.
 	 */
 	'idpdisco.enableremember' => TRUE,
+	
+	// Disco service only accepts entities it knows.
+	'idpdisco.validate' => TRUE,
+	
+	'idpdisco.extDiscoveryStorage' => NULL, //'http://rnd.feide.no',
 
 	/*
 	 * IdP Discovery service look configuration. 
@@ -233,7 +238,7 @@ $config = array (
 	 * - 'yes'  The "yes"-button has focus.
 	 * - 'no'   The "no"-button has focus.
 	 */
-	'consent_autofocus' => NULL,
+	'consent_autofocus' => 'yes',
 
 
 	/*
@@ -433,4 +438,4 @@ $config = array (
 );
 
 
-?>
+?>
\ No newline at end of file