diff --git a/nefed.xml b/nefed.xml
index 240ff8a5b8db6c548a9c064bcf9bb285e8690476..cc0fa3677392fdfd9b55f83f72c0046f184e5cb8 100644
--- a/nefed.xml
+++ b/nefed.xml
@@ -1252,65 +1252,85 @@
             <mdrpi:RegistrationInfo registrationAuthority="https://nebraska.edu/nefed" />
             <mdattr:EntityAttributes>
                 <saml:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-                    <saml:AttributeValue>
-                        https://nebraska.edu/category/registered-by-nefed</saml:AttributeValue>
+                    <saml:AttributeValue>https://nebraska.edu/category/registered-by-nefed</saml:AttributeValue>
                 </saml:Attribute>
                 <saml:Attribute Name="http://shibboleth.net/ns/attributes/releaseAllValues" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-                    <saml:AttributeValue>
-                        unNUID</saml:AttributeValue>
+                    <saml:AttributeValue>unNUID</saml:AttributeValue>
                 </saml:Attribute>
             </mdattr:EntityAttributes>
             <mdui:UIInfo>
-                <mdui:DisplayName xml:lang="en">NeSIS
-                    Dev</mdui:DisplayName>
+                <mdui:DisplayName xml:lang="en">NeSIS Dev</mdui:DisplayName>
                 <mdui:Description xml:lang="en">Nebraska Student Information System</mdui:Description>
-                <mdui:InformationURL xml:lang="en">
-                    https://its.nebraska.edu</mdui:InformationURL>
-                <mdui:PrivacyStatementURL xml:lang="en">
-                    https://its.nebraska.edu/policies-processes/idm-privacy-policy</mdui:PrivacyStatementURL>
-                <mdui:Logo height="85" width="141" xml:lang="en">
-                    https://campuscontent.nebraska.edu/NESIS/nesisbg.jpg</mdui:Logo>
+                <mdui:InformationURL xml:lang="en">https://its.nebraska.edu</mdui:InformationURL>
+                <mdui:PrivacyStatementURL xml:lang="en">https://its.nebraska.edu/policies-processes/idm-privacy-policy</mdui:PrivacyStatementURL>
+                <mdui:Logo height="85" width="141" xml:lang="en">https://campuscontent.nebraska.edu/NESIS/nesisbg.jpg</mdui:Logo>
             </mdui:UIInfo>
         </Extensions>
         <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
             <Extensions>
-                <init:RequestInitiator
-                    xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init"
-                    Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init"
-                    Location="https://emsdevnu.nebraska.edu/Shibboleth.sso/Login" />
-                <idpdisc:DiscoveryResponse
-                    xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
-                    Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
-                    Location="https://emsdevnu.nebraska.edu/Shibboleth.sso/Login" index="1" />
+                <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://emsdevnu.nebraska.edu/Shibboleth.sso/Login" />
+                <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://emsdevnu.nebraska.edu/Shibboleth.sso/Login" index="1" />
             </Extensions>
-            <KeyDescriptor>
+            <KeyDescriptor use="signing">
                 <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                    <ds:KeyName>
-                        nesisemsdev.uncsdom.uneb.edu</ds:KeyName>
-                    <ds:X509Data>
-                        <ds:X509SubjectName>CN=nesisemsdev.uncsdom.uneb.edu</ds:X509SubjectName>
-                        <ds:X509Certificate>MIIEGzCCAoOgAwIBAgIJALcwkujoIbUDMA0GCSqGSIb3DQEBCwUAMCcxJTAjBgNV
-                            BAMTHG5lc2lzZW1zZGV2LnVuY3Nkb20udW5lYi5lZHUwHhcNMTgwNjA3MTU1MzU5
-                            WhcNMjgwNjA0MTU1MzU5WjAnMSUwIwYDVQQDExxuZXNpc2Vtc2Rldi51bmNzZG9t
-                            LnVuZWIuZWR1MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEArWkyCkjK
-                            Mjibj9ehFUJMae/qrBtuVPLGDCXA/NOwvBHqDwX7RqVN9eQ/xKR9M8CCqNjveUlk
-                            fh+xX+QjS6Ymsdfmc5UpGpFjhgAA7rMKvIsLJCY0B1VToGlGV7bEniBYR2cWuHro
-                            3g3e7eP0UgH/W6sMbSC4BO3XU6Zo3Cx0bUsqndzPoVDu1eesNEgpVwYUQzPu5Jy9
-                            AcTMfVFPR8VFYNNv+vliofU2LxT8Cae1eteQ8u9MKRP3LWwkbPiKa0Bvdicr+fkW
-                            6QBE81UxrL8+y5AdsKufUeV16ZtohF2iPI+89TrtLpwfZwNZbod8XZdrhW6WqNnm
-                            +mH0fjV7MEymj5gF780Q28FrmF6XpKtxKhzGYCx94I3UjF4FM8ziWgablh7JMp/7
-                            IHvH+m55/nPXUafayE/N8Yk8ABN6CAVuB9aciMOROl1npFdR5/WXgQX05SKwPqns
-                            /SFhfLhY28JbAT0nRNoXrxDNeWbs/L3jPgP4NMtfpVXqbbrBP5a3svSZAgMBAAGj
-                            SjBIMCcGA1UdEQQgMB6CHG5lc2lzZW1zZGV2LnVuY3Nkb20udW5lYi5lZHUwHQYD
-                            VR0OBBYEFI/xzQIXyK4u8aLhyKwE/v7+BkQPMA0GCSqGSIb3DQEBCwUAA4IBgQAA
-                            WpKeoTuZN2+9Uf/hMfI0K/ohMjMoaFXe47mRl+Vw/genQ0Q9Cry8NEGf5P4kieR8
-                            OR8sl4ZscIo+3maHPI3Qiudjy7LbnuknNgtiRZ7tjMvhwnZEbTnFuFty+6PMQCGc
-                            5V872JwkJGeyUeM8VhVgbA/AaxoHjLGz4s6YPCJn+VLWOUqLmTnAB79qx6nW3U8/
-                            F3AsTfqHl1aCdG4hmLplHcO5xWhexM8FLYtVkk3GKbk178f5Ou1yYDXk1OAMSJfi
-                            7Y4BrVbPTuW5eDEOdmu2AHg7+cnvqhW/1lOE8rmO8uVyN6rcKKIijsRMMo5SODuY
-                            mpTe9NyTK+lJdIteqMzSf4n+PbimV1/YrCIqXBj3xYugKg1iLpVVPgRyCVTxJ5sY
-                            YFmnnBIWCnCkYjTnirA2Uev5xrwL9XWVpbaVs5KvPvjdPsKtgUQMIAMZowfqcRey
-                            PjeUNwmh0FkEjqIm5cwp4lkNhRDBPD+OuCpdORVC2qlCn2t37p+WBlnqatvUO/M=
+                    <ds:KeyName>nesisemsdevnu.nead.nebraska.edu</ds:KeyName>
+                    <ds:X509Data>
+                        <ds:X509SubjectName>CN=nesisemsdevnu.nead.nebraska.edu</ds:X509SubjectName>
+                        <ds:X509Certificate>MIIELzCCApegAwIBAgIUfx8v+iGa6QvtDhbtViQTfBI+PBgwDQYJKoZIhvcNAQEL
+                            BQAwKjEoMCYGA1UEAxMfbmVzaXNlbXNkZXZudS5uZWFkLm5lYnJhc2thLmVkdTAe
+                            Fw0yNDA5MDYxODQ2MTFaFw0zNDA5MDQxODQ2MTFaMCoxKDAmBgNVBAMTH25lc2lz
+                            ZW1zZGV2bnUubmVhZC5uZWJyYXNrYS5lZHUwggGiMA0GCSqGSIb3DQEBAQUAA4IB
+                            jwAwggGKAoIBgQDiLRkoN49olKDq1LHmgwHs/MT3vG55gaDkdF+XuYAfrN4r9n49
+                            ZK05eM7+HXjKfITKIBpbv5MLcjg3mHYR+4TnZIdizBd5+akZey1QwghtIP9vUMJo
+                            NxN1MwPGCBicZRcMvuCfvZmom4HTgHncucSfcP0xBLgvbw1rmKLVVTT4dKng8laB
+                            OzeqbPjjtl+bO8z3VfkmZllRUlxXCQbMFUqx2inPnYe37IhQnoQI628mY7u0SmpX
+                            VAYjH4rTeNHuJ0DQ6rYHKvhVXjzUjcZc68ez47Geeqf0/SyAhxdYQBIJeteQEk23
+                            RyG/l+EipMiyADsATNWWV7o22CL9hDnr2R+Acf2g5OleWJuqSHz0D/dS5LJCiV8n
+                            y0X9k1mojIhVRvnf8up1snpkOZnW+qLpdF3U+4nnExikW/S2wdvtUJ3C9UimN1j4
+                            /ZPAcdnytCQQw38AorInFdYAWR+86KNXMoDqoLJ7203xMUY+KB/fpnoAnPi24Ubi
+                            0SZEAYnoZYrNxeUCAwEAAaNNMEswKgYDVR0RBCMwIYIfbmVzaXNlbXNkZXZudS5u
+                            ZWFkLm5lYnJhc2thLmVkdTAdBgNVHQ4EFgQUeQ6uCHzUBtdrU21v78gh/OmdzVEw
+                            DQYJKoZIhvcNAQELBQADggGBAG5W0tHjqlkOhvZXKtw6vfw9cgOkZbaWAXVtukl6
+                            CLieSNZ3EaZs0IiYrzKLtpajt2Bm9yOLudlgr/YsXVsDxjwUR1F2T2MF7nF0Hma5
+                            RNrXjZZr/aT9P45LMMulNQyzKa/rUurUjkl7dRqLTYFLJETnVHFjt08toS/ldPMr
+                            wJXUtqDLK3UwsYVYuYo+ehfYMKSCVxeCtuOz8SoBeYtU8QMaFXko7gVvlSVBNxbT
+                            +kmyQ0WFsofmgjMeSDaHx7766ODIHWSyBfXaGnRCbXDXetmkbttau36t3UpxJy2i
+                            RL+69SZ5fdWqOjv0qOj01wpMPP/cGt6MpnIJ5WjBgZ4T0HRO/9umuBgPgPCkpln/
+                            yiTopmy7in2qDMLoZtj8L5IIc71rbqKjywLrAC+0gYoNOLxSq8RIfR54NlHHd1RA
+                            Hg1XtQ81Ie+mt7+UOyQK76CqdtsoEQSmOlkFIpCUWpeni2Szw5jn0ww2IhaG7uGW
+                            GZAkZoXMOMEYKL++deoA93dHhQ==
+                        </ds:X509Certificate>
+                    </ds:X509Data>
+                </ds:KeyInfo>
+            </KeyDescriptor>
+            <KeyDescriptor use="encryption">
+                <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+                    <ds:KeyName>nesisemsdevnu.nead.nebraska.edu</ds:KeyName>
+                    <ds:X509Data>
+                        <ds:X509SubjectName>CN=nesisemsdevnu.nead.nebraska.edu</ds:X509SubjectName>
+                        <ds:X509Certificate>MIIELzCCApegAwIBAgIUGIqXKwQS3xyloOIWLxvnocnAZd4wDQYJKoZIhvcNAQEL
+                            BQAwKjEoMCYGA1UEAxMfbmVzaXNlbXNkZXZudS5uZWFkLm5lYnJhc2thLmVkdTAe
+                            Fw0yNDA5MDYxODQ2MDhaFw0zNDA5MDQxODQ2MDhaMCoxKDAmBgNVBAMTH25lc2lz
+                            ZW1zZGV2bnUubmVhZC5uZWJyYXNrYS5lZHUwggGiMA0GCSqGSIb3DQEBAQUAA4IB
+                            jwAwggGKAoIBgQCJlqGg9dpx/Nv376dKCZqSoTSFOPflQfRyranUa90wYU40MGdo
+                            LJ9AEsw1/IJd7AdgB8HBnnaLmRHIgrn6PTZQUHAflVzy7NYS6PMki2Ss0PSxZfRB
+                            kD3UbJ+J5QuGvpeuD8G0NHzP6rEOVsZD3bLPDxspa/3Z4BQwA6p9w4Wj5RVj3doM
+                            HOdGPCtvDwTczy21Bc8XgLyDVfEe3pTZYxAze1UEv5hQ53d0gb28giqiqDr0fnJi
+                            JTMBN8+PbvbdYMsch0MwD3rATinqkbOODuxeK75pdu6nCx5hdwzQl09JylC30Bc5
+                            s+YLAuj7UF529fzV+XfGyeppoZ1qj72fg7moEHg+tHFuJEFctFyaBv69ea+QxkcH
+                            kQaZTomaKsECiVgMvlgINvmXo5XhOuc26C/cAtwZzelVNLRrbprZgQv2S2BXHBQO
+                            IT6FSNKwlzOaEQpHXCe5iNlC0zDSpbpekn5rj/c8zbheVR3N+dkO/hCLbSl4pBex
+                            IX99tKu2pacbKl8CAwEAAaNNMEswKgYDVR0RBCMwIYIfbmVzaXNlbXNkZXZudS5u
+                            ZWFkLm5lYnJhc2thLmVkdTAdBgNVHQ4EFgQUIR84hcyy8KvBWeznxwa5k0sZy9cw
+                            DQYJKoZIhvcNAQELBQADggGBAEj0uQiUnDK21CenGL1/uOHJnKPvtafouKK4mu5Q
+                            H6D+EUQGJL5/C5fdRMrHqykng9OOAlnLunO4HNupWByfm/R6fx6ftZC0WRSgjGRn
+                            uCAfOofSqeF/255OLHnAn8KhaZ/1ChRB2R3hvhWpiWbT+hr74ONnDO4ZSkXkuwvi
+                            +yKUT9YhwG/TAkFlZj+3qzAjrOJFSnyxSnfxLScYrBmCjw8qlOnxGHtVQG1jzR6z
+                            ssr3efQe8ODUTnjTxU/I/odjjU53pNbaZz66bv7jzvg1J7WyWWPjuQzVrNZU5LIt
+                            genX8Oy4vuxv11SoyVFLhsxj1jklHS2JmFeTgfaBuR9pcnogeCVuzMopRNZnNIQg
+                            aGkb8a3Hfr7AGcr/N68xTZq/T3epUrfeIyt4vY0S7PURHD1rPcvYicK7txPEia6y
+                            KPQ/R6bScvLTHRWywuKe8WKeLMAIBCh2JCKwrnOrsEojZeW2CwjXShxPKqtlPApp
+                            9W2TfyjIziijzQ9+T9vwphxn5w==
                         </ds:X509Certificate>
                     </ds:X509Data>
                 </ds:KeyInfo>
@@ -1324,52 +1344,30 @@
                 <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep" />
                 <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p" />
             </KeyDescriptor>
-            <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                Location="https://emsdevnu.nebraska.edu/Shibboleth.sso/Artifact/SOAP" index="1" />
-            <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                Location="https://emsdevnu.nebraska.edu/Shibboleth.sso/SLO/SOAP" />
-            <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
-                Location="https://emsdevnu.nebraska.edu/Shibboleth.sso/SLO/Redirect" />
-            <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
-                Location="https://emsdevnu.nebraska.edu/Shibboleth.sso/SLO/POST" />
-            <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"
-                Location="https://emsdevnu.nebraska.edu/Shibboleth.sso/SLO/Artifact" />
-            <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
-                Location="https://emsdevnu.nebraska.edu/Shibboleth.sso/SAML2/POST" index="1" />
-            <AssertionConsumerService
-                Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
-                Location="https://emsdevnu.nebraska.edu/Shibboleth.sso/SAML2/POST-SimpleSign"
-                index="2" />
-            <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"
-                Location="https://emsdevnu.nebraska.edu/Shibboleth.sso/SAML2/Artifact" index="3" />
-            <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS"
-                Location="https://emsdevnu.nebraska.edu/Shibboleth.sso/SAML2/ECP" index="4" />
-            <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post"
-                Location="https://emsdevnu.nebraska.edu/Shibboleth.sso/SAML/POST" index="5" />
-            <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01"
-                Location="https://emsdevnu.nebraska.edu/Shibboleth.sso/SAML/Artifact" index="6" />
+            <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://emsdevnu.nebraska.edu/Shibboleth.sso/Artifact/SOAP" index="1" />
+            <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://emsdevnu.nebraska.edu/Shibboleth.sso/SLO/SOAP" />
+            <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://emsdevnu.nebraska.edu/Shibboleth.sso/SLO/Redirect" />
+            <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://emsdevnu.nebraska.edu/Shibboleth.sso/SLO/POST" />
+            <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://emsdevnu.nebraska.edu/Shibboleth.sso/SLO/Artifact" />
+            <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://emsdevnu.nebraska.edu/Shibboleth.sso/SAML2/POST" index="1" />
+            <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://emsdevnu.nebraska.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2" />
+            <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://emsdevnu.nebraska.edu/Shibboleth.sso/SAML2/Artifact" index="3" />
+            <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://emsdevnu.nebraska.edu/Shibboleth.sso/SAML2/ECP" index="4" />
+            <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://emsdevnu.nebraska.edu/Shibboleth.sso/SAML/POST" index="5" />
+            <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://emsdevnu.nebraska.edu/Shibboleth.sso/SAML/Artifact" index="6" />
         </SPSSODescriptor>
         <Organization>
-            <OrganizationName xml:lang="en">Nebraska
-                Student Information System</OrganizationName>
+            <OrganizationName xml:lang="en">Nebraska Student Information System</OrganizationName>
             <OrganizationDisplayName xml:lang="en">Nesis Dev</OrganizationDisplayName>
-            <OrganizationURL xml:lang="en">
-                https://its.nebraska.edu</OrganizationURL>
+            <OrganizationURL xml:lang="en">https://its.nebraska.edu</OrganizationURL>
         </Organization>
         <ContactPerson contactType="technical">
             <GivenName>AMP Tech Team</GivenName>
-            <EmailAddress>
-                amptechnical@nebraska.edu</EmailAddress>
+            <EmailAddress>amptechnical@nebraska.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="administrative">
             <GivenName>AMP Support Team</GivenName>
-            <EmailAddress>
-                amp@nebraska.edu</EmailAddress>
-        </ContactPerson>
-        <ContactPerson contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-            <GivenName>ITS Security</GivenName>
-            <EmailAddress>
-                security@nebraska.edu</EmailAddress>
+            <EmailAddress>amp@nebraska.edu</EmailAddress>
         </ContactPerson>
     </EntityDescriptor>
     <EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_ca0d422558ceb1cc653adb62c4c9695003f382a2" entityID="https://emststsc.nebraska.edu/shibboleth">