diff --git a/templates.php b/templates.php
index d60bd40da8755e3a8425c3e6dc63cc2b8f997aed..8c5ddea9deb36293343f9de310f2ded2addd3e8a 100755
--- a/templates.php
+++ b/templates.php
@@ -1024,6 +1024,7 @@ function getGETArgument(name){
 			// Old Shibboleth WAYF protocol
 			wayf_authReq_URL = wayf_URL;
 			wayf_authReq_URL += '?providerId=' + encodeURIComponent(wayf_sp_entityID);
+			wayf_authReq_URL += '&target=' + encodeURIComponent(return_url);
 			wayf_authReq_URL += '&shire=' + encodeURIComponent(wayf_sp_samlACURL);
 			wayf_authReq_URL += '&time={$utcTime}';
 		}