Resolved SWAMID-224

4 files changed, 92 insertions, 94 deletions

diff --git a/scripts/get-metadata.sh b/scripts/get-metadata.sh
index efc73c7d..3e39b80e 100755
--- a/scripts/get-metadata.sh
+++ b/scripts/get-metadata.sh
@@ -39,7 +39,7 @@ else
 	if [ -s "${metadataurl}" ]; then
 		metadata=`cat "$metadataurl"`
 	else
-		urls="https://${metadataurl}/idp/shibboleth https://${metadataurl}/Shibboleth.sso/Metadata https://${metadataurl}/saml/index/sp-metadata"
+		urls="https://${metadataurl}/idp/shibboleth https://${metadataurl}/Shibboleth.sso/Metadata https://${metadataurl}/saml/index/sp-metadata https://${metadataurl}/saml/metadata"
 		for i in ${urls}; do
 			metadata=`curl -s -k -f "${i}"`
 			[ -n "${metadata}" ] && break
diff --git a/swamid-2.0/scalear-staging2.herokuapp.com.xml b/swamid-2.0/scalear-staging2.herokuapp.com.xml
index 84057d0d..446bf6ba 100644
--- a/swamid-2.0/scalear-staging2.herokuapp.com.xml
+++ b/swamid-2.0/scalear-staging2.herokuapp.com.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xrd="http://docs.oasis-open.org/ns/xri/xrd-1.0" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://scalear-staging2.herokuapp.com" xml:base="swamid-2.0/.xml">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xrd="http://docs.oasis-open.org/ns/xri/xrd-1.0" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://scalear-staging2.herokuapp.com">
   <md:Extensions>
     <mdattr:EntityAttributes>
       <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
@@ -15,8 +15,8 @@
         <mdui:DisplayName xml:lang="en">Scalable Learning</mdui:DisplayName>
         <mdui:Description xml:lang="en">Blended learning platform for interactive in-class and online education.</mdui:Description>
         <mdui:Description xml:lang="sv">Plattform för stöd av "flipped classroom" utbildning.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://scalear-staging2.herokuapp.com/#/about</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://scalear-staging2.herokuapp.com/#/privacy</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="en">https://scalear-staging2.herokuapp.com/home/about</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://scalear-staging2.herokuapp.com/home/privacy</mdui:PrivacyStatementURL>
         <mdui:Logo xml:lang="en" height="100" width="100">https://scalear-staging2.herokuapp.com/assets/logo-a66e557f3f93b4d5195033ba1a1527a3.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
@@ -24,37 +24,36 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-MIIDljCCAn4CCQCqbKeZgkK/pTANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UEBhMC
-U0UxEjAQBgNVBAgMCVNUT0NLSE9MTTESMBAGA1UEBwwJU1RPQ0tIT0xNMRowGAYD
-VQQKDBFTQ0FMQUJMRSBMRUFSTklORzEQMA4GA1UECwwHc2NhbGVhcjEnMCUGA1UE
-Awwec2NhbGVhci1zdGFnaW5nMi5oZXJva3VhcHAuY29tMB4XDTE2MDIyNTExMzI0
-NVoXDTE3MDIyNDExMzI0NVowgYwxCzAJBgNVBAYTAlNFMRIwEAYDVQQIDAlTVE9D
-S0hPTE0xEjAQBgNVBAcMCVNUT0NLSE9MTTEaMBgGA1UECgwRU0NBTEFCTEUgTEVB
-Uk5JTkcxEDAOBgNVBAsMB3NjYWxlYXIxJzAlBgNVBAMMHnNjYWxlYXItc3RhZ2lu
-ZzIuaGVyb2t1YXBwLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AJt5KVMamR4VM+orgoHIXhdY4YCjojE+NLpUTlQhVY+FHnBxEf5NbZoX617qoys1
-XY+X4wWgGEKqzaGryWh2d7vKjkhyRkYyTTMnnMEVeRx2B9d1dtWXwn+VLob6LbGJ
-Att/yJnj9N4YdYsE4wQ96KBTcEOzDjXaMlhkR1DD2v2iGqmlE+rfwAfOJjWe1sD8
-VvIYyTKfoA3QbF3M75TR77RrEDr//rsAWLd0WGv77NxiSrGVes5pPEZlH/s5DUh3
-nanhrStyLZUPpVZDgzWfnntZnnV2Y18EwmFtbfiP3uoQOQBCrPCRplcqSfXxmGDT
-VveQGP10ZpJAEZPVDM9lhrkCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAJD01OmDH
-fYT/KcRxAAWi7+RwOZsQmv+t3wkmzEQ3BDOETQ4XMVAtommwGtSaL24Z7Mo6lxSJ
-v0yCCkBCxkeKST8Rsx0iaTKdFpKc8DesPplEmNjbud+BoA7VNyXBAiGsifOzHXW3
-MQytZReHD/l0AO6DSjukXZADKQQtfQIJplMyCfBJMBtNlG6PH6oPiGxI6NhDytHO
-ZXxK1uQ+5ZunqauacDK2idAh/Oe4aaAfxYMp1Oh7/oXU80nM3RDz2hVSeQVy85y8
-pq7jZ9OX3q5P9y5agNP6P1SaXNjgSUdAFMSbaltu5/I5LPo8RYXZUScKW1N9LEx7
-qONqqzvm+WBOIQ==
-</ds:X509Certificate>
+      MIIDlDCCAnwCCQCyPGeQZpWxojANBgkqhkiG9w0BAQsFADCBizELMAkGA1UEBhMC
+      U0UxETAPBgNVBAgMCFNUT0NIT0xNMRIwEAYDVQQHDAlTVE9DS0hPTE0xGjAYBgNV
+      BAoMEVNDQUxBQkxFIExFQVJOSU5HMRAwDgYDVQQLDAdzY2FsZWFyMScwJQYDVQQD
+      DB5zY2FsZWFyLXN0YWdpbmcyLmhlcm9rdWFwcC5jb20wHhcNMTcwOTI3MDgzMzE1
+      WhcNMTgwOTI3MDgzMzE1WjCBizELMAkGA1UEBhMCU0UxETAPBgNVBAgMCFNUT0NI
+      T0xNMRIwEAYDVQQHDAlTVE9DS0hPTE0xGjAYBgNVBAoMEVNDQUxBQkxFIExFQVJO
+      SU5HMRAwDgYDVQQLDAdzY2FsZWFyMScwJQYDVQQDDB5zY2FsZWFyLXN0YWdpbmcy
+      Lmhlcm9rdWFwcC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCb
+      eSlTGpkeFTPqK4KByF4XWOGAo6IxPjS6VE5UIVWPhR5wcRH+TW2aF+te6qMrNV2P
+      l+MFoBhCqs2hq8lodne7yo5IckZGMk0zJ5zBFXkcdgfXdXbVl8J/lS6G+i2xiQLb
+      f8iZ4/TeGHWLBOMEPeigU3BDsw412jJYZEdQw9r9ohqppRPq38AHziY1ntbA/Fby
+      GMkyn6AN0GxdzO+U0e+0axA6//67AFi3dFhr++zcYkqxlXrOaTxGZR/7OQ1Id52p
+      4a0rci2VD6VWQ4M1n557WZ51dmNfBMJhbW34j97qEDkAQqzwkaZXKkn18Zhg01b3
+      kBj9dGaSQBGT1QzPZYa5AgMBAAEwDQYJKoZIhvcNAQELBQADggEBADyVvXFfsTwC
+      YVoiFCaW2PfXO0dJgGRnNtIzkC8/iKXTnGjflb35ai+EpbSO7GsTMWZVyIzV71z8
+      DxFM3Gfp6FTd8xlGGmtrwfJZnFqNNrrxm+YQSGk1l4Gal8ZdQ5l+5j65HRWMbYKP
+      298UYVliM/1Wh9jW94Q305PVfJD5Wpeu0OrXS0VPzlW+MOs5e2DAsO7OG0YoqH2z
+      y20+gi5doZ33pHgiNwH1zMQIvVwAu9uQizSlgserIuhlEvnRfBkFLv/86RX9+54r
+      3aXwCBhr8rGwhonDuZYCGJNu3Qa5Yt1zLBOQJr+/U/sSEBq+ZDx9mI52PjG6sHTw
+      EkfY5Bb1pkM=
+     </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="1" Location="https://scalear-staging2.herokuapp.com/saml/consume"/>
     <md:AttributeConsumingService index="0">
       <md:ServiceName xml:lang="en">Scalable Learning</md:ServiceName>
       <md:ServiceDescription xml:lang="en">Blended learning platform for interactive in-class and online education.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="sv">Plattform för stöd av "flipped classroom" utbildning. </md:ServiceDescription>
+      <md:ServiceDescription xml:lang="sv">Plattform för stöd av "flipped classroom" utbildning.</md:ServiceDescription>
       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:2.5.4.42"/>
@@ -66,14 +65,14 @@ qONqqzvm+WBOIQ==
   <md:Organization>
     <md:OrganizationName xml:lang="en">Scalable Learning</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Scalable Learning</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.scalable-learning.com</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">scalear-staging2.herokuapp.com</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>ScalableLearning</Company>
-    <EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
+    <EmailAddress>support@scalable-learning.com</EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>ScalableLearning</Company>
-    <EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
+    <EmailAddress>support@scalable-learning.com</EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/test.scalable-learning.com.xml b/swamid-2.0/test.scalable-learning.com.xml
index 73d4563d..db561c6f 100644
--- a/swamid-2.0/test.scalable-learning.com.xml
+++ b/swamid-2.0/test.scalable-learning.com.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xrd="http://docs.oasis-open.org/ns/xri/xrd-1.0" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://test.scalable-learning.com" xml:base="swamid-2.0/.xml">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xrd="http://docs.oasis-open.org/ns/xri/xrd-1.0" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://test.scalable-learning.com">
   <md:Extensions>
     <mdattr:EntityAttributes>
       <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
@@ -13,10 +13,10 @@
     <md:Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">Scalable Learning</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Blended learning platform for interactive in-class and online education.</mdui:Description>
-        <mdui:Description xml:lang="sv">Plattform för stöd av "flipped classroom" utbildning.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://test.scalable-learning.com/#/about</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://test.scalable-learning.com/#/privacy</mdui:PrivacyStatementURL>
+        <mdui:Description xml:lang="en">Blended learning platform for interactive in-class and online education. </mdui:Description>
+        <mdui:Description xml:lang="sv">Plattform för stöd av "flipped classroom" utbildning. </mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://test.scalable-learning.com/home/about</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://test.scalable-learning.com/home/privacy</mdui:PrivacyStatementURL>
         <mdui:Logo xml:lang="en" height="100" width="100">https://test.scalable-learning.com/assets/logo-a66e557f3f93b4d5195033ba1a1527a3.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
@@ -24,36 +24,36 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-MIIDjjCCAnYCCQCloAAdJBMwmDANBgkqhkiG9w0BAQsFADCBiDELMAkGA1UEBhMC
-U0UxEjAQBgNVBAgMCVNUT0NLSE9MTTESMBAGA1UEBwwJU1RPQ0tIT0xNMRowGAYD
-VQQKDBFTQ0FMQUJMRSBMRUFSTklORzEQMA4GA1UECwwHc2NhbGVhcjEjMCEGA1UE
-AwwadGVzdC5zY2FsYWJsZS1sZWFybmluZy5jb20wHhcNMTYwMjI1MTEyNzUxWhcN
-MTcwMjI0MTEyNzUxWjCBiDELMAkGA1UEBhMCU0UxEjAQBgNVBAgMCVNUT0NLSE9M
-TTESMBAGA1UEBwwJU1RPQ0tIT0xNMRowGAYDVQQKDBFTQ0FMQUJMRSBMRUFSTklO
-RzEQMA4GA1UECwwHc2NhbGVhcjEjMCEGA1UEAwwadGVzdC5zY2FsYWJsZS1sZWFy
-bmluZy5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDPYtv2obOV
-NRyVFwnXcl0pdqz8LHo/vkJGPHc8UHla8w+ceQQ7NZlmSeVOvXskStYwqh4HzAyk
-FmTb7hkCTP9yRnLrLTZUd6z2q0I0Skdo8A8r02mFfDPFin049/pqau9dlwbvLQyL
-IDcp2iqGeudpkikl7Gn7/zBkERCtwmiROAIs9B9m5VoAddLp/oVGnmErSPj0iVBu
-FB9kTiPoix5UFbTVGYhRFZiy6vFYfanBf9TucRpP8MicE3pLsYQ3IcIT9gcAtpyb
-Y/GhHejXuxzEJ9QOkO1vRsL93ddxlAtWzewtBE8kKZYMbIkq5TyceQ1aTTVgKHqZ
-/pu/6E8ChiIJAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAB1TYuTkeR5OGmfugdw4
-9fB9hilkPpvTXDDLQUCR/QVNnfBORE+HUzCDp11TqT0TaRr4HV66rxH4FaJcn4qW
-YMYmDJ0oa7eLPvGIV5pRiDa4Cp5s+V61gNYIfGNHDS8BC3HouyiFW/owtQdOiNWE
-V/QqkTImxrx30CjnyNF5jttPEkAS4GGgo1O34IvEUXjE7Xe0CdlaQ9uRjNg8YxqI
-pfmqBJSriM/SplXf72vjn9kg+fgsv8qp7yoj3pVt1o4Re8x3AvrF+sHd1m4J1BwA
-uU1mjJmnSIatkJ0UHoAPKlQrteJiiFL1yphWuTQnoRqUYsnxqIxA+vFOtrt9pQaM
-ROE=
-</ds:X509Certificate>
+      MIIDjjCCAnYCCQD6bDhuARPmYjANBgkqhkiG9w0BAQsFADCBiDELMAkGA1UEBhMC
+      U0UxEjAQBgNVBAgMCVNUT0NLSE9MTTESMBAGA1UEBwwJU1RPQ0tIT0xNMRowGAYD
+      VQQKDBFTQ0FMQUJMRSBMRUFSTklORzEQMA4GA1UECwwHc2NhbGVhcjEjMCEGA1UE
+      AwwadGVzdC5zY2FsYWJsZS1sZWFybmluZy5jb20wHhcNMTcwOTI3MDgzMTQyWhcN
+      MTgwOTI3MDgzMTQyWjCBiDELMAkGA1UEBhMCU0UxEjAQBgNVBAgMCVNUT0NLSE9M
+      TTESMBAGA1UEBwwJU1RPQ0tIT0xNMRowGAYDVQQKDBFTQ0FMQUJMRSBMRUFSTklO
+      RzEQMA4GA1UECwwHc2NhbGVhcjEjMCEGA1UEAwwadGVzdC5zY2FsYWJsZS1sZWFy
+      bmluZy5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDPYtv2obOV
+      NRyVFwnXcl0pdqz8LHo/vkJGPHc8UHla8w+ceQQ7NZlmSeVOvXskStYwqh4HzAyk
+      FmTb7hkCTP9yRnLrLTZUd6z2q0I0Skdo8A8r02mFfDPFin049/pqau9dlwbvLQyL
+      IDcp2iqGeudpkikl7Gn7/zBkERCtwmiROAIs9B9m5VoAddLp/oVGnmErSPj0iVBu
+      FB9kTiPoix5UFbTVGYhRFZiy6vFYfanBf9TucRpP8MicE3pLsYQ3IcIT9gcAtpyb
+      Y/GhHejXuxzEJ9QOkO1vRsL93ddxlAtWzewtBE8kKZYMbIkq5TyceQ1aTTVgKHqZ
+      /pu/6E8ChiIJAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAArZpa7OBUjTOSp0aXWb
+      q9AMWAahZ8MH6IrjVd+nY9/WFERMDSy8fSW8S8Zch6H8TZwAdqqTKjcfzuaGYNae
+      4uwkG0fHi6nlEEljfowmBNg1nY3rceIr8p2RbR/lZMklRwC/hHYvcBHNgnNqaviY
+      BnO5qnr3Ov0IVCatIGz4tMSRCdfjSP5s+gSRf9Kuj6LyR+4wR/hQTsLAIr/brVYs
+      5DMCb/JBHOz262215XBMB/sWKKr4XiyZC1Idn/EYeA7AmIj4lyV1qePVDLod2ZSJ
+      bx/F0bA8M0pIwZ3aRpz46PGKsrOMlcZrzR9F2Bz6KMWpaD/NPK4NxXroOtDpM0ej EV0=
+     </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>
+   urn:oasis:names:tc:SAML:2.0:nameid-format:transient
+  </md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="1" Location="https://test.scalable-learning.com/saml/consume"/>
     <md:AttributeConsumingService index="0">
       <md:ServiceName xml:lang="en">Scalable Learning</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Blended learning platform for interactive in-class and online education.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Blended learning platform for interactive in-class and online education. </md:ServiceDescription>
       <md:ServiceDescription xml:lang="sv">Plattform för stöd av "flipped classroom" utbildning. </md:ServiceDescription>
       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
@@ -66,14 +66,14 @@ ROE=
   <md:Organization>
     <md:OrganizationName xml:lang="en">Scalable Learning</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Scalable Learning</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.scalable-learning.com</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">test.scalable-learning.com</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>ScalableLearning</Company>
-    <EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
+    <EmailAddress>support@scalable-learning.com</EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>ScalableLearning</Company>
-    <EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
+    <EmailAddress>support@scalable-learning.com</EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/www.scalable-learning.com.xml b/swamid-2.0/www.scalable-learning.com.xml
index 1c6ae3ef..46fa4778 100644
--- a/swamid-2.0/www.scalable-learning.com.xml
+++ b/swamid-2.0/www.scalable-learning.com.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xrd="http://docs.oasis-open.org/ns/xri/xrd-1.0" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://www.scalable-learning.com" xml:base="swamid-2.0/.xml">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xrd="http://docs.oasis-open.org/ns/xri/xrd-1.0" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://www.scalable-learning.com">
   <md:Extensions>
     <mdattr:EntityAttributes>
       <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
@@ -13,10 +13,10 @@
     <md:Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">Scalable Learning</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Blended learning platform for interactive in-class and online education.</mdui:Description>
-        <mdui:Description xml:lang="sv">Plattform för stöd av "flipped classroom" utbildning.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.scalable-learning.com/home/about</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.scalable-learning.com/#/privacy</mdui:PrivacyStatementURL>
+        <mdui:Description xml:lang="en">Blended learning platform for interactive in-class and online education. </mdui:Description>
+        <mdui:Description xml:lang="sv">Plattform för stöd av "flipped classroom" utbildning. </mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.scalable-learning.com/home/about</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.scalable-learning.com/home/privacy</mdui:PrivacyStatementURL>
         <mdui:Logo xml:lang="en" height="100" width="100">https://www.scalable-learning.com/assets/logo-a66e557f3f93b4d5195033ba1a1527a3.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
@@ -24,35 +24,34 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-MIIDjDCCAnQCCQDSdbONyCFCGzANBgkqhkiG9w0BAQsFADCBhzELMAkGA1UEBhMC
-U0UxEjAQBgNVBAgMCVNUT0NLSE9MTTESMBAGA1UEBwwJU1RPQ0tIT0xNMRowGAYD
-VQQKDBFTQ0FMQUJMRSBMRUFSTklORzEQMA4GA1UECwwHc2NhbGVhcjEiMCAGA1UE
-AwwZd3d3LnNjYWxhYmxlLWxlYXJuaW5nLmNvbTAeFw0xNjAyMjUxMTEyNTdaFw0x
-NzAyMjQxMTEyNTdaMIGHMQswCQYDVQQGEwJTRTESMBAGA1UECAwJU1RPQ0tIT0xN
-MRIwEAYDVQQHDAlTVE9DS0hPTE0xGjAYBgNVBAoMEVNDQUxBQkxFIExFQVJOSU5H
-MRAwDgYDVQQLDAdzY2FsZWFyMSIwIAYDVQQDDBl3d3cuc2NhbGFibGUtbGVhcm5p
-bmcuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAut3wWgrigP2C
-L8zUlER/YfTtQCvExXxCBRLtP9pxHb4q3a+PkJvy+xUD4TZhtLu5rdMqXvSfrCCC
-K6FO+MoLmVu7BzANl2RW37FUtkc2oyDD79hVwyZkcb3VSbYe3v4E5wwyEr40EZuY
-VK8VvGXZWCj1jw3wWfqU8Y683luDvRq7B7dlRDkzV5NfuOhk0Ghq3WoqPX//1+TE
-hWrFXJw/t/KVIatePcOFUj2q8+fvAfVgJ/RS7NKCqbmcm7dYR38QptWXpK22FDEh
-9QNFFXLahLK/g52rMdonlL646TgXfHcYdK3h9uHkh0d2cTaNFUisho/RQ706GwOV
-rrmfMjKXrQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQA7/7Yl+dZf7anFmHFq7xl7
-WoiyNJcdzMxvGjAtaaxUUGKNCV44AMdnLJGXeDmbmWXOE+2o3WD54+1mUKLeKsXe
-TbQ6mXOEetXBHzuWxOY0a65s4mCGyqPgHTQ5bLSz/h+GLjRvMqLoXtOXhj3Woa1f
-LHep+dsEIbVdze3uxztVBzOKqkfKsT1eqSrW+z5ir72bkVf0F7rMjPh3VnGgoL65
-wYSrKz3rhwVbkf0eGJeoICGCV6Gbtc/b4D/GXx9VhWA+ni5WBJn4wE0Gy7dvr1If
-fkpQngoTsFRNOJ5gwo2dZAVQYRBKXToI2elv5qW151WnpWn9gdQjaW7zzKSkPDRf
-</ds:X509Certificate>
+      MIIDjDCCAnQCCQDC601Yku4SKjANBgkqhkiG9w0BAQsFADCBhzELMAkGA1UEBhMC
+      U0UxEjAQBgNVBAgMCVNUT0NLSE9MTTESMBAGA1UEBwwJU1RPQ0tIT0xNMRowGAYD
+      VQQKDBFTQ0FMQUJMRSBMRUFSTklORzEQMA4GA1UECwwHc2NhbGVhcjEiMCAGA1UE
+      AwwZd3d3LnNjYWxhYmxlLWxlYXJuaW5nLmNvbTAeFw0xNzA5MjcwODI0MjVaFw0x
+      ODA5MjcwODI0MjVaMIGHMQswCQYDVQQGEwJTRTESMBAGA1UECAwJU1RPQ0tIT0xN
+      MRIwEAYDVQQHDAlTVE9DS0hPTE0xGjAYBgNVBAoMEVNDQUxBQkxFIExFQVJOSU5H
+      MRAwDgYDVQQLDAdzY2FsZWFyMSIwIAYDVQQDDBl3d3cuc2NhbGFibGUtbGVhcm5p
+      bmcuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAut3wWgrigP2C
+      L8zUlER/YfTtQCvExXxCBRLtP9pxHb4q3a+PkJvy+xUD4TZhtLu5rdMqXvSfrCCC
+      K6FO+MoLmVu7BzANl2RW37FUtkc2oyDD79hVwyZkcb3VSbYe3v4E5wwyEr40EZuY
+      VK8VvGXZWCj1jw3wWfqU8Y683luDvRq7B7dlRDkzV5NfuOhk0Ghq3WoqPX//1+TE
+      hWrFXJw/t/KVIatePcOFUj2q8+fvAfVgJ/RS7NKCqbmcm7dYR38QptWXpK22FDEh
+      9QNFFXLahLK/g52rMdonlL646TgXfHcYdK3h9uHkh0d2cTaNFUisho/RQ706GwOV
+      rrmfMjKXrQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQApgL+f6XwcQ13PWxKJemFK
+      QqIZQbsADqK+KOlpOWFO8aNbvDd5WsFgvQEbKwbPeGIfp7Nb0/5gtabWBwOs0dA3
+      3llHJeGzWH5NMr0R/2+N8z2XY50Z8a5w38vSvgHwFgJh1HEsFhx5zFOsHjSYI3PD
+      +vyDMuhCPe1UhoTeffBmmH97Oe1DBVlzDwTD9ZdcAaiGB9XbaLP6gDFuBjU/GBd3
+      Ngbl+ZAuTcGpNzUYfuNC9MXHcn3/SKyl5NnL4wEe1j9sL0JnDYwvSTlnovqOVHY4
+      nCMfHlNippwYPVOHUqOxAnKoInWIxsKiyQkFsjG/sbIwCc7rTwpdn9jtTAnvZkPn
+     </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="1" Location="https://www.scalable-learning.com/saml/consume"/>
     <md:AttributeConsumingService index="0">
       <md:ServiceName xml:lang="en">Scalable Learning</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Blended learning platform for interactive in-class and online education.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Blended learning platform for interactive in-class and online education. </md:ServiceDescription>
       <md:ServiceDescription xml:lang="sv">Plattform för stöd av "flipped classroom" utbildning. </md:ServiceDescription>
       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
@@ -65,14 +64,14 @@ fkpQngoTsFRNOJ5gwo2dZAVQYRBKXToI2elv5qW151WnpWn9gdQjaW7zzKSkPDRf
   <md:Organization>
     <md:OrganizationName xml:lang="en">Scalable Learning</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Scalable Learning</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.scalable-learning.com</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">www.scalable-learning.com</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>ScalableLearning</Company>
-    <EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
+    <EmailAddress>support@scalable-learning.com</EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>ScalableLearning</Company>
-    <EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
+    <EmailAddress>support@scalable-learning.com</EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>