diff --git a/config-templates/config.php b/config-templates/config.php
index e95e60ab7236b2803304875dd5bc6866d37837b3..e4fb7276cf26c25572ae7c381a7cd7a162286e3c 100644
--- a/config-templates/config.php
+++ b/config-templates/config.php
@@ -172,7 +172,7 @@ $config = array (
 	/*
 	 * Option to override the default settings for the session cookie name
 	 */
-	'session.cookie.name' => NULL,
+	'session.cookie.name' => 'SimpleSAMLSessionID',
 
 	/*
 	 * Expiration time for the session cookie, in seconds.
@@ -236,7 +236,7 @@ $config = array (
 	/*
 	 * Option to override the default settings for the auth token cookie
 	 */
-	'session.authtoken.cookiename' => null,
+	'session.authtoken.cookiename' => 'SimpleSAMLAuthToken',
 
 	/*
 	 * Languages available, RTL languages, and what language is default