diff --git a/config/config.sample.yml b/config/config.sample.yml
index dd0fa95ad0..fb6381dbda 100644
--- a/config/config.sample.yml
+++ b/config/config.sample.yml
@@ -32,37 +32,38 @@ dev:
   border-manager: border_manager
   search-engine: phrasea
   task-manager: task_manager
-  auth-providers:
-    facebook:
-      enabled: false
-      options:
-        app-id: ''
-        secret: ''
-    twitter:
-      enabled: false
-      options:
-        consumer-key: ''
-        consumer-secret: ''
-    google-plus:
-      enabled: false
-      options:
-        client-id: ''
-        client-secret: ''
-    github:
-      enabled: false
-      options:
-        client-id: ''
-        client-secret: ''
-    viadeo:
-      enabled: false
-      options:
-        client-id: ''
-        client-secret: ''
-    linkedin:
-      enabled: false
-      options:
-        client-id: ''
-        client-secret: ''
+  authentication:
+    providers:
+      facebook:
+        enabled: false
+        options:
+          app-id: ''
+          secret: ''
+      twitter:
+        enabled: false
+        options:
+          consumer-key: ''
+          consumer-secret: ''
+      google-plus:
+        enabled: false
+        options:
+          client-id: ''
+          client-secret: ''
+      github:
+        enabled: false
+        options:
+          client-id: ''
+          client-secret: ''
+      viadeo:
+        enabled: false
+        options:
+          client-id: ''
+          client-secret: ''
+      linkedin:
+        enabled: false
+        options:
+          client-id: ''
+          client-secret: ''
   registration-fields:
     -
       name: company
@@ -92,37 +93,38 @@ prod:
   border-manager: border_manager
   search-engine: phrasea
   task-manager: task_manager
-  auth-providers:
-    facebook:
-      enabled: false
-      options:
-        app-id: ''
-        secret: ''
-    twitter:
-      enabled: false
-      options:
-        consumer-key: ''
-        consumer-secret: ''
-    google-plus:
-      enabled: false
-      options:
-        client-id: ''
-        client-secret: ''
-    github:
-      enabled: false
-      options:
-        client-id: ''
-        client-secret: ''
-    viadeo:
-      enabled: false
-      options:
-        client-id: ''
-        client-secret: ''
-    linkedin:
-      enabled: false
-      options:
-        client-id: ''
-        client-secret: ''
+  authentication:
+    providers:
+      facebook:
+        enabled: false
+        options:
+          app-id: ''
+          secret: ''
+      twitter:
+        enabled: false
+        options:
+          consumer-key: ''
+          consumer-secret: ''
+      google-plus:
+        enabled: false
+        options:
+          client-id: ''
+          client-secret: ''
+      github:
+        enabled: false
+        options:
+          client-id: ''
+          client-secret: ''
+      viadeo:
+        enabled: false
+        options:
+          client-id: ''
+          client-secret: ''
+      linkedin:
+        enabled: false
+        options:
+          client-id: ''
+          client-secret: ''
     registration-fields:
       -
         name: company
@@ -152,37 +154,38 @@ test:
   border-manager: border_manager
   search-engine: phrasea
   task-manager: task_manager
-  auth-providers:
-    facebook:
-      enabled: false
-      options:
-        app-id: ''
-        secret: ''
-    twitter:
-      enabled: false
-      options:
-        consumer-key: ''
-        consumer-secret: ''
-    google-plus:
-      enabled: false
-      options:
-        client-id: ''
-        client-secret: ''
-    github:
-      enabled: false
-      options:
-        client-id: ''
-        client-secret: ''
-    viadeo:
-      enabled: false
-      options:
-        client-id: ''
-        client-secret: ''
-    linkedin:
-      enabled: false
-      options:
-        client-id: ''
-        client-secret: ''
+  authentication:
+    providers:
+      facebook:
+        enabled: false
+        options:
+          app-id: ''
+          secret: ''
+      twitter:
+        enabled: false
+        options:
+          consumer-key: ''
+          consumer-secret: ''
+      google-plus:
+        enabled: false
+        options:
+          client-id: ''
+          client-secret: ''
+      github:
+        enabled: false
+        options:
+          client-id: ''
+          client-secret: ''
+      viadeo:
+        enabled: false
+        options:
+          client-id: ''
+          client-secret: ''
+      linkedin:
+        enabled: false
+        options:
+          client-id: ''
+          client-secret: ''
     registration-fields:
       -
         name: company
diff --git a/config/connexions.sample.yml b/config/connexions.sample.yml
index 420770688a..8142431678 100644
--- a/config/connexions.sample.yml
+++ b/config/connexions.sample.yml
@@ -2,15 +2,15 @@
 #Please refer to Doctrine documentation abstraction layer for database connection configuration
 #DBAL connection : http://www.doctrine-project.org/docs/dbal/2.1/en/reference/configuration.html
 
-#Define a connexion to MYSQL database named main_connexion
+#Defines a connexion to MYSQL database named main_connexion
 main_connexion:
-    host: <HOSTNAME>
-    port: <PORT>
-    user: <USERNAME>
-    password: <PASSWORD>
-    dbname: <DATABASE_NAME>
-    driver: pdo_mysql
-    charset: UTF8
+  host: <HOSTNAME>
+  port: <PORT>
+  user: <USERNAME>
+  password: <PASSWORD>
+  dbname: <DATABASE_NAME>
+  driver: pdo_mysql
+  charset: UTF8
 
 #Define a connexion to a SQLite database named test_connexion
 test_connexion:
diff --git a/config/services.sample.yml b/config/services.sample.yml
index 7460cb6e95..9390a1c827 100644
--- a/config/services.sample.yml
+++ b/config/services.sample.yml
@@ -154,47 +154,47 @@ Border:
       #Enable validation on incoming files
       enabled: true
       checkers:
-          #Check for duplicated file based on their sha256 check sum
-          -
-            type: Checker\Sha256
-            enabled: true
-          #Check for duplicated file based on their UUID
-          -
-            type: Checker\UUID
-            enabled: true
-          #Check colorspace (if applicable)
-          -
-            type: Checker\Colorspace
-            enabled: false
-            options:
-              colorspaces: [cmyk, grayscale, rgb]
-          #Check file dimension (if applicable)
-          -
-            type: Checker\Dimension
-            enabled: false
-            options:
-              width: 80
-              height: 160
-          #Check file extension
-          #set to false to enable all file extensions
-          -
-            type: Checker\Extension
-            enabled: false
-            options:
-              extensions: [jpg, jpeg, bmp, tif, gif, png, pdf, doc, odt, mpg, mpeg, mov, avi, xls, flv, mp3, mp2]
-          #Check filename
-          -
-            type: Checker\Filename
-            enabled: false
-            options:
-              sensitive: true
-          #Check media type
-          #Set to false to enable all mediatype
-          -
-            type: Checker\MediaType
-            enabled: false
-            options:
-              mediatypes: [Audio, Document, Flash, Image, Video]
+        #Check for duplicated file based on their sha256 check sum
+        -
+          type: Checker\Sha256
+          enabled: true
+        #Check for duplicated file based on their UUID
+        -
+          type: Checker\UUID
+          enabled: true
+        #Check colorspace (if applicable)
+        -
+          type: Checker\Colorspace
+          enabled: false
+          options:
+            colorspaces: [cmyk, grayscale, rgb]
+        #Check file dimension (if applicable)
+        -
+          type: Checker\Dimension
+          enabled: false
+          options:
+            width: 80
+            height: 160
+        #Check file extension
+        #set to false to enable all file extensions
+        -
+          type: Checker\Extension
+          enabled: false
+          options:
+            extensions: [jpg, jpeg, bmp, tif, gif, png, pdf, doc, odt, mpg, mpeg, mov, avi, xls, flv, mp3, mp2]
+        #Check filename
+        -
+          type: Checker\Filename
+          enabled: false
+          options:
+            sensitive: true
+        #Check media type
+        #Set to false to enable all mediatype
+        -
+          type: Checker\MediaType
+          enabled: false
+          options:
+            mediatypes: [Audio, Document, Flash, Image, Video]
 SearchEngine:
   phrasea:
     type: SearchEngine\PhraseaEngine
diff --git a/lib/Alchemy/Phrasea/Core/Provider/AuthenticationManagerServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/AuthenticationManagerServiceProvider.php
index ce50610c4f..618b053e49 100644
--- a/lib/Alchemy/Phrasea/Core/Provider/AuthenticationManagerServiceProvider.php
+++ b/lib/Alchemy/Phrasea/Core/Provider/AuthenticationManagerServiceProvider.php
@@ -53,7 +53,8 @@ class AuthenticationManagerServiceProvider implements ServiceProviderInterface
 
             $providers = new ProvidersCollection();
 
-            foreach ($app['phraseanet.configuration']->get('auth-providers') as $providerId => $data) {
+            $authConf = $app['phraseanet.configuration']->get('authentication');
+            foreach ($authConf['providers'] as $providerId => $data) {
                 if (isset($data['enabled']) && false === $data['enabled']) {
                     continue;
                 }
diff --git a/lib/conf.d/config.yml b/lib/conf.d/config.yml
index c1df1d8531..2475e6b4de 100644
--- a/lib/conf.d/config.yml
+++ b/lib/conf.d/config.yml
@@ -31,37 +31,38 @@ dev:
   border-manager: border_manager
   search-engine: phrasea
   task-manager: task_manager
-  auth-providers:
-    facebook:
-      enabled: false
-      options:
-        app-id: ''
-        secret: ''
-    twitter:
-      enabled: false
-      options:
-        consumer-key: ''
-        consumer-secret: ''
-    google-plus:
-      enabled: false
-      options:
-        client-id: ''
-        client-secret: ''
-    github:
-      enabled: false
-      options:
-        client-id: ''
-        client-secret: ''
-    viadeo:
-      enabled: false
-      options:
-        client-id: ''
-        client-secret: ''
-    linkedin:
-      enabled: false
-      options:
-        client-id: ''
-        client-secret: ''
+  authentication:
+    providers:
+      facebook:
+        enabled: false
+        options:
+          app-id: ''
+          secret: ''
+      twitter:
+        enabled: false
+        options:
+          consumer-key: ''
+          consumer-secret: ''
+      google-plus:
+        enabled: false
+        options:
+          client-id: ''
+          client-secret: ''
+      github:
+        enabled: false
+        options:
+          client-id: ''
+          client-secret: ''
+      viadeo:
+        enabled: false
+        options:
+          client-id: ''
+          client-secret: ''
+      linkedin:
+        enabled: false
+        options:
+          client-id: ''
+          client-secret: ''
   registration-fields:
     -
       name: company
@@ -91,37 +92,38 @@ prod:
   border-manager: border_manager
   search-engine: phrasea
   task-manager: task_manager
-  auth-providers:
-    facebook:
-      enabled: false
-      options:
-        app-id: ''
-        secret: ''
-    twitter:
-      enabled: false
-      options:
-        consumer-key: ''
-        consumer-secret: ''
-    google-plus:
-      enabled: false
-      options:
-        client-id: ''
-        client-secret: ''
-    github:
-      enabled: false
-      options:
-        client-id: ''
-        client-secret: ''
-    viadeo:
-      enabled: false
-      options:
-        client-id: ''
-        client-secret: ''
-    linkedin:
-      enabled: false
-      options:
-        client-id: ''
-        client-secret: ''
+  authentication:
+    providers:
+      facebook:
+        enabled: false
+        options:
+          app-id: ''
+          secret: ''
+      twitter:
+        enabled: false
+        options:
+          consumer-key: ''
+          consumer-secret: ''
+      google-plus:
+        enabled: false
+        options:
+          client-id: ''
+          client-secret: ''
+      github:
+        enabled: false
+        options:
+          client-id: ''
+          client-secret: ''
+      viadeo:
+        enabled: false
+        options:
+          client-id: ''
+          client-secret: ''
+      linkedin:
+        enabled: false
+        options:
+          client-id: ''
+          client-secret: ''
   registration-fields:
     -
       name: company
@@ -151,37 +153,38 @@ test:
   border-manager: border_manager
   search-engine: phrasea
   task-manager: task_manager
-  auth-providers:
-    facebook:
-      enabled: false
-      options:
-        app-id: ''
-        secret: ''
-    twitter:
-      enabled: false
-      options:
-        consumer-key: ''
-        consumer-secret: ''
-    google-plus:
-      enabled: false
-      options:
-        client-id: ''
-        client-secret: ''
-    github:
-      enabled: false
-      options:
-        client-id: ''
-        client-secret: ''
-    viadeo:
-      enabled: false
-      options:
-        client-id: ''
-        client-secret: ''
-    linkedin:
-      enabled: false
-      options:
-        client-id: ''
-        client-secret: ''
+  authentication:
+    providers:
+      facebook:
+        enabled: false
+        options:
+          app-id: ''
+          secret: ''
+      twitter:
+        enabled: false
+        options:
+          consumer-key: ''
+          consumer-secret: ''
+      google-plus:
+        enabled: false
+        options:
+          client-id: ''
+          client-secret: ''
+      github:
+        enabled: false
+        options:
+          client-id: ''
+          client-secret: ''
+      viadeo:
+        enabled: false
+        options:
+          client-id: ''
+          client-secret: ''
+      linkedin:
+        enabled: false
+        options:
+          client-id: ''
+          client-secret: ''
   registration-fields:
     -
       name: company
diff --git a/lib/conf.d/connexions.yml b/lib/conf.d/connexions.yml
index 420770688a..138b4c3ef9 100644
--- a/lib/conf.d/connexions.yml
+++ b/lib/conf.d/connexions.yml
@@ -2,18 +2,18 @@
 #Please refer to Doctrine documentation abstraction layer for database connection configuration
 #DBAL connection : http://www.doctrine-project.org/docs/dbal/2.1/en/reference/configuration.html
 
-#Define a connexion to MYSQL database named main_connexion
+#Defines a connexion to MYSQL database named main_connexion
 main_connexion:
-    host: <HOSTNAME>
-    port: <PORT>
-    user: <USERNAME>
-    password: <PASSWORD>
-    dbname: <DATABASE_NAME>
-    driver: pdo_mysql
-    charset: UTF8
+  host: <HOSTNAME>
+  port: <PORT>
+  user: <USERNAME>
+  password: <PASSWORD>
+  dbname: <DATABASE_NAME>
+  driver: pdo_mysql
+  charset: UTF8
 
-#Define a connexion to a SQLite database named test_connexion
+#Defines a connexion to a SQLite database named test_connexion
 test_connexion:
-    driver: pdo_sqlite
-    path: '/tmp/db.sqlite'
-    charset: UTF8
+  driver: pdo_sqlite
+  path: '/tmp/db.sqlite'
+  charset: UTF8
diff --git a/lib/conf.d/services.yml b/lib/conf.d/services.yml
index f5076a8234..9a15a5541d 100644
--- a/lib/conf.d/services.yml
+++ b/lib/conf.d/services.yml
@@ -154,47 +154,47 @@ Border:
       #Enable validation on incoming files
       enabled: true
       checkers:
-          #Check for duplicated file based on their sha256 check sum
-          -
-            type: Checker\Sha256
-            enabled: true
-          #Check for duplicated file based on their UUID
-          -
-            type: Checker\UUID
-            enabled: true
-          #Check colorspace (if applicable)
-          -
-            type: Checker\Colorspace
-            enabled: false
-            options:
-              colorspaces: [cmyk, grayscale, rgb]
-          #Check file dimension (if applicable)
-          -
-            type: Checker\Dimension
-            enabled: false
-            options:
-              width: 80
-              height: 160
-          #Check file extension
-          #set to false to enable all file extensions
-          -
-            type: Checker\Extension
-            enabled: false
-            options:
-              extensions: [jpg, jpeg, bmp, tif, gif, png, pdf, doc, odt, mpg, mpeg, mov, avi, xls, flv, mp3, mp2]
-          #Check filename
-          -
-            type: Checker\Filename
-            enabled: false
-            options:
-              sensitive: true
-          #Check media type
-          #Set to false to enable all mediatype
-          -
-            type: Checker\MediaType
-            enabled: false
-            options:
-              mediatypes: [Audio, Document, Flash, Image, Video]
+        #Check for duplicated file based on their sha256 check sum
+        -
+          type: Checker\Sha256
+          enabled: true
+        #Check for duplicated file based on their UUID
+        -
+          type: Checker\UUID
+          enabled: true
+        #Check colorspace (if applicable)
+        -
+          type: Checker\Colorspace
+          enabled: false
+          options:
+            colorspaces: [cmyk, grayscale, rgb]
+        #Check file dimension (if applicable)
+        -
+          type: Checker\Dimension
+          enabled: false
+          options:
+            width: 80
+            height: 160
+        #Check file extension
+        #set to false to enable all file extensions
+        -
+          type: Checker\Extension
+          enabled: false
+          options:
+            extensions: [jpg, jpeg, bmp, tif, gif, png, pdf, doc, odt, mpg, mpeg, mov, avi, xls, flv, mp3, mp2]
+        #Check filename
+        -
+          type: Checker\Filename
+          enabled: false
+          options:
+            sensitive: true
+        #Check media type
+        #Set to false to enable all mediatype
+        -
+          type: Checker\MediaType
+          enabled: false
+          options:
+            mediatypes: [Audio, Document, Flash, Image, Video]
 SearchEngine:
   phrasea:
     type: SearchEngine\PhraseaEngine