diff --git a/CHANGES b/CHANGES
index 54c5d2f13e18272f4401f260351a599e0cf4b47f..2fee395c410b06798abaa198179060517a0cef8c 100755
--- a/CHANGES
+++ b/CHANGES
@@ -24,8 +24,11 @@ necessary for such releases.
 
 
 SWITCHwayf Changes and Version History:
+1.17.2    
+        - Changed default SessionInitiator to /Login because this has been
+          the default SessionInitiator in Shibboleth for quite some time now.
 
-1.17.1    Release date:  14. June 2012
+1.17.1  Release date:  14. June 2012
         - Fixed a bug occuring when wayf_sp_samlDSURL contains GET arguments
           Bug reported with a patch by Takeshi Nishimura from NII (Japan)
         - Fixed typo in configuration otpion useImprovedDropDownList
diff --git a/default-embedded-wayf.php b/default-embedded-wayf.php
index 49b3b2fc9507b21f17da4a87931d8d6f6c3eac48..88162d3d7573016d623ccff53f39948cf209decc 100644
--- a/default-embedded-wayf.php
+++ b/default-embedded-wayf.php
@@ -143,8 +143,8 @@ var wayf_show_categories =  true;
 // var wayf_use_discovery_service = false;
 
 // Session Initiator URL of the Service Provider
-// Examples: "https://econf.switch.ch/Shibboleth.sso/DS", "https://dokeos.unige.ch/Shibboleth.sso/DS"
-// This will implicitely be set to wayf_sp_samlDSURL = wayf_sp_handlerURL + "/DS";
+// Examples: "https://econf.switch.ch/Shibboleth.sso/Login", "https://dokeos.unige.ch/Shibboleth.sso/DS"
+// This will implicitely be set to wayf_sp_samlDSURL = wayf_sp_handlerURL + "/Login";
 // or will be set automatically if the page where the Embedded WAYF is placed is called
 // with a 'return' and an 'entityID' GET Arguments
 // [Optional, if wayf_use_discovery_service = true 
@@ -275,7 +275,7 @@ var wayf_show_categories =  true;
   is logged in into your application.
   -->
   <p>
-    <strong>Login:</strong> Javascript is not available for your web browser. Therefore, please <a href="/Shibboleth.sso/DS?target=">proceed manually</a>.
+    <strong>Login:</strong> Javascript is not available for your web browser. Therefore, please <a href="/Shibboleth.sso/Login?target=">proceed manually</a>.
   </p>
 </noscript>
 
diff --git a/templates.php b/templates.php
index 7606ef3256a66ad4dadc0afee4501e5528c90725..0c962fe985bab670814789ce65d931160f85c7b2 100755
--- a/templates.php
+++ b/templates.php
@@ -779,7 +779,7 @@ function getGETArgumentSeparator(url){
 		&& typeof(wayf_sp_samlDSURL) == "undefined"
 		){
 		// Set to default DS handler
-		wayf_sp_samlDSURL = wayf_sp_handlerURL + "/DS";
+		wayf_sp_samlDSURL = wayf_sp_handlerURL + "/Login";
 	}
 	
 	if (