diff --git a/config/config.sample.yml b/config/config.sample.yml
index 7004ec6fec..f9c321d710 100644
--- a/config/config.sample.yml
+++ b/config/config.sample.yml
@@ -32,6 +32,55 @@ 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: ''
+    registration-fields:
+      -
+        name: company
+        required: true
+        constraints:
+          -
+            name:
+            options: []
+    registration-fields:
+      -
+        name: company
+        required: true
+      -
+        name: first-name
+        required: true
+      -
+        name: geoname-id
+        required: true
 
 ##############
 # PRODUCTION #
@@ -51,6 +100,37 @@ 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: ''
 
 ##############
 #    TEST    #
@@ -70,4 +150,35 @@ 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: ''
 
diff --git a/lib/conf.d/config.yml b/lib/conf.d/config.yml
index 589e80ebf0..66edfda496 100644
--- a/lib/conf.d/config.yml
+++ b/lib/conf.d/config.yml
@@ -31,6 +31,47 @@ 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: ''
+    registration-fields:
+      -
+        name: company
+        required: true
+      -
+        name: first-name
+        required: true
+      -
+        name: geoname-id
+        required: true
 
 ##############
 # PRODUCTION #
@@ -50,6 +91,37 @@ 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: ''
 
 ##############
 #    TEST    #
@@ -69,4 +141,35 @@ 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: ''