diff --git a/keystone/federation/idp.py b/keystone/federation/idp.py
index 2194278108..bea65f095d 100644
--- a/keystone/federation/idp.py
+++ b/keystone/federation/idp.py
@@ -568,18 +568,12 @@ class MetadataGenerator(object):
                   CONF.saml.idp_contact_name,
                   CONF.saml.idp_contact_surname,
                   CONF.saml.idp_contact_email,
-                  CONF.saml.idp_contact_telephone]
+                  CONF.saml.idp_contact_telephone,
+                  CONF.saml.idp_contact_type]
         for value in params:
             if value is None:
                 return False
 
-        # Check if contact type is an invalid value
-        valid_type_values = ['technical', 'other', 'support', 'administrative',
-                             'billing']
-        if CONF.saml.idp_contact_type not in valid_type_values:
-            msg = _('idp_contact_type must be one of: [technical, other, '
-                    'support, administrative or billing.')
-            raise exception.ValidationError(msg)
         return True
 
     def _check_organization_values(self):
diff --git a/keystone/tests/unit/test_v3_federation.py b/keystone/tests/unit/test_v3_federation.py
index be89bdb622..87c18eb094 100644
--- a/keystone/tests/unit/test_v3_federation.py
+++ b/keystone/tests/unit/test_v3_federation.py
@@ -3999,13 +3999,6 @@ class IdPMetadataGenerationTests(test_v3.RestfulTestCase):
         self.assertIsNotNone(idpsso_descriptor.organization)
         self.assertEqual([], idpsso_descriptor.contact_person)
 
-    def test_metadata_invalid_contact_type(self):
-        self.config_fixture.config(
-            group='saml',
-            idp_contact_type="invalid")
-        self.assertRaises(exception.ValidationError,
-                          self.generator.generate_metadata)
-
     def test_metadata_invalid_idp_sso_endpoint(self):
         self.config_fixture.config(
             group='saml',