diff --git a/.gitignore b/.gitignore
index a0d5e6a..e4c06e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -103,3 +103,7 @@ example/sp/sp.xml
 example/idp2/idp_conf_local.py
 
 example/sp/sp_conf_local.py
+
+example/sp/my_backup_sp_conf_local.py
+
+example/sp/backup_sp_conf_local.py
diff --git a/src/s2repoze/plugins/sp.py b/src/s2repoze/plugins/sp.py
index f48ac0a..3152628 100644
--- a/src/s2repoze/plugins/sp.py
+++ b/src/s2repoze/plugins/sp.py
@@ -33,6 +33,7 @@ from paste.httpexceptions import HTTPNotImplemented
 from paste.httpexceptions import HTTPInternalServerError
 from paste.request import parse_dict_querystring
 from paste.request import construct_url
+from saml2.httputil import SeeOther
 from saml2.client_base import ECP_SERVICE
 from zope.interface import implements
 
@@ -281,11 +282,15 @@ class SAML2Plugin(object):
                     else:
                         sid_ = sid()
                         self.outstanding_queries[sid_] = came_from
-                        logger.info("Redirect to Discovery Service function")
+                        logger.debug("Redirect to Discovery Service function")
                         eid = _cli.config.entityid
+                        ret = _cli.config.getattr("endpoints",
+                                                  "sp")["discovery_response"][0][0]
+                        ret += "?sid=%s" % sid_
                         loc = _cli.create_discovery_service_request(
-                            self.discosrv, eid)
-                        return -1, HTTPSeeOther(headers=[('Location', loc)])
+                            self.discosrv, eid, **{"return": ret})
+                        return -1, SeeOther(loc)
+
                 else:
                     return -1, HTTPNotImplemented(
                         detail='No WAYF or DJ present!')
@@ -366,6 +371,15 @@ class SAML2Plugin(object):
                 raise Exception(
                     "Failed to construct the AuthnRequest: %s" % exc)
 
+
+            try:
+                ret = _cli.config.getattr("endpoints","sp")["discovery_response"][0][0]
+                if (environ["PATH_INFO"]) in ret and ret.split(environ["PATH_INFO"])[1] == "":
+                    query = parse_qs(environ["QUERY_STRING"])
+                    sid = query["sid"][0]
+                    came_from = self.outstanding_queries[sid]
+            except:
+                pass
             # remember the request
             self.outstanding_queries[_sid] = came_from