diff --git a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_Struct.pm b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_Struct.pm
index b3bac3cc1..364899fa0 100644
--- a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_Struct.pm
+++ b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_Struct.pm
@@ -683,7 +683,6 @@ sub struct {
                 _nodes => [
                     qw(samlSPSSODescriptorAuthnRequestsSigned
                       samlSPSSODescriptorWantAssertionsSigned
-                      samlSPSSODescriptorKeyDescriptorSigning
                       n:samlSPSSODescriptorSingleLogoutService
                       n:samlSPSSODescriptorAssertionConsumerService
                       n:samlSPSSODescriptorArtifactResolutionService
@@ -695,8 +694,6 @@ sub struct {
                   'bool:/samlSPSSODescriptorAuthnRequestsSigned',
                 samlSPSSODescriptorWantAssertionsSigned =>
                   'bool:/samlSPSSODescriptorWantAssertionsSigned',
-                samlSPSSODescriptorKeyDescriptorSigning =>
-                  'filearea:/samlSPSSODescriptorKeyDescriptorSigning',
 
                 samlSPSSODescriptorSingleLogoutService => {
                     _nodes => [
@@ -742,7 +739,6 @@ sub struct {
             samlIDPSSODescriptor => {
                 _nodes => [
                     qw(samlIDPSSODescriptorWantAuthnRequestsSigned
-                      samlIDPSSODescriptorKeyDescriptorSigning
                       n:samlIDPSSODescriptorSingleSignOnService
                       n:samlIDPSSODescriptorSingleLogoutService
                       n:samlIDPSSODescriptorArtifactResolutionService)
@@ -751,8 +747,6 @@ sub struct {
 
                 samlIDPSSODescriptorWantAuthnRequestsSigned =>
                   'bool:/samlIDPSSODescriptorWantAuthnRequestsSigned',
-                samlIDPSSODescriptorKeyDescriptorSigning =>
-                  'filearea:/samlIDPSSODescriptorKeyDescriptorSigning',
 
                 samlIDPSSODescriptorSingleSignOnService => {
                     _nodes => [
@@ -1138,7 +1132,6 @@ sub testStruct {
         samlOrganizationURL                        => $testNotDefined,
         samlSPSSODescriptorAuthnRequestsSigned     => $boolean,
         samlSPSSODescriptorWantAssertionsSigned            => $boolean,
-        samlSPSSODescriptorKeyDescriptorSigning    => $testNotDefined,
         samlSPSSODescriptorSingleLogoutServiceHTTPRedirect => $testNotDefined,
         samlSPSSODescriptorSingleLogoutServiceHTTPPost     => $testNotDefined,
         samlSPSSODescriptorSingleLogoutServiceSOAP => $testNotDefined,
@@ -1149,7 +1142,6 @@ sub testStruct {
           $testNotDefined,
         samlSPSSODescriptorArtifactResolutionServiceArtifact => $testNotDefined,
         samlIDPSSODescriptorWantAuthnRequestsSigned          => $boolean,
-        samlIDPSSODescriptorKeyDescriptorSigning             => $testNotDefined,
         samlIDPSSODescriptorSingleSignOnServiceHTTPRedirect  => $testNotDefined,
         samlIDPSSODescriptorSingleSignOnServiceHTTPPost      => $testNotDefined,
         samlIDPSSODescriptorSingleSignOnServiceSOAP          => $testNotDefined,
@@ -1318,7 +1310,6 @@ sub defaultConf {
         samlSPMetaDataOptionsEncryptionMode            => 'none',
         samlSPSSODescriptorAuthnRequestsSigned         => '1',
         samlSPSSODescriptorWantAssertionsSigned        => '1',
-        samlSPSSODescriptorKeyDescriptorSigning        => '',
         samlSPSSODescriptorSingleLogoutServiceHTTPRedirect =>
           'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect;' 
           . $portal
@@ -1352,7 +1343,6 @@ sub defaultConf {
           . $portal
           . '/saml/artifact',
         samlIDPSSODescriptorWantAuthnRequestsSigned => '1',
-        samlIDPSSODescriptorKeyDescriptorSigning       => '',
         samlIDPSSODescriptorSingleSignOnServiceHTTPRedirect =>
           'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect;' 
           . $portal
@@ -1393,6 +1383,10 @@ sub defaultConf {
           'urn:oasis:names:tc:SAML:2.0:bindings:SOAP;' 
           . $portal
           . '/saml/AA/SOAP;',
+        samlServicePrivateKeySig                        => '',
+        samlServicePublicKeySig                         => '',
+        samlServicePrivateKeyEnc                        => '',
+        samlServicePublicKeyEnc                         => '',
 
     };
 }
diff --git a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_i18n.pm b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_i18n.pm
index 2090dd1ec..98c544cf7 100644
--- a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_i18n.pm
+++ b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_i18n.pm
@@ -271,7 +271,6 @@ sub en {
         samlSPSSODescriptorAuthnRequestsSigned =>
           'Signed Authentication Request',
         samlSPSSODescriptorWantAssertionsSigned => 'Want Assertions Signed',
-        samlSPSSODescriptorKeyDescriptorSigning     => 'Signing Key',
         samlSPSSODescriptorSingleLogoutService      => 'Single Logout',
         samlSPSSODescriptorSingleLogoutServiceHTTPRedirect => 'HTTP Redirect',
         samlSPSSODescriptorSingleLogoutServiceHTTPPost     => 'HTTP POST',
@@ -288,7 +287,6 @@ sub en {
         samlIDPSSODescriptor                           => 'Identity Provider',
         samlIDPSSODescriptorWantAuthnRequestsSigned =>
           'Want Authentication Request Signed',
-        samlIDPSSODescriptorKeyDescriptorSigning      => 'Signing Key',
         samlIDPSSODescriptorSingleSignOnService             => 'Single Sign On',
         samlIDPSSODescriptorSingleSignOnServiceHTTPRedirect => 'HTTP Redirect',
         samlIDPSSODescriptorSingleSignOnServiceHTTPPost     => 'HTTP POST',
@@ -543,7 +541,6 @@ sub fr {
           'Requêtes d\'authentification signées',
         samlSPSSODescriptorWantAssertionsSigned =>
           'Exige des assertions signées',
-        samlSPSSODescriptorKeyDescriptorSigning => 'Clé de signature',
         samlSPSSODescriptorSingleLogoutService      => 'Single Logout',
         samlSPSSODescriptorSingleLogoutServiceHTTPRedirect =>
           'Redirection HTTP',
@@ -562,7 +559,6 @@ sub fr {
         samlIDPSSODescriptor => 'Fournisseur d\'identité',
         samlIDPSSODescriptorWantAuthnRequestsSigned =>
           'Exige des requêtes d\'authentification signées',
-        samlIDPSSODescriptorKeyDescriptorSigning => 'Clé de signature',
         samlIDPSSODescriptorSingleSignOnService  => 'Single Sign On',
         samlIDPSSODescriptorSingleSignOnServiceHTTPRedirect =>
           'Redirection HTTP',