diff --git a/README.md b/README.md
index e9019a35..fe0807da 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,6 @@
 - [Requirements](#requirements)
 - [Change Log](https://github.com/Requarks/wiki/blob/master/CHANGELOG.md)
 - [Feature Requests](https://wikijs.canny.io/features)
-- [Project Planning](https://waffle.io/Requarks/wiki)
 - [Milestones](#milestones)
 - [Chat with us](#gitter)
 - [Special Thanks](#special-thanks)
diff --git a/app/data.yml b/app/data.yml
index 0785ac78..eda74570 100644
--- a/app/data.yml
+++ b/app/data.yml
@@ -50,9 +50,8 @@ defaults:
         password: null
         privateKey: null
         sslVerify: true
-      signature:
-        name: Wiki
-        email: wiki@example.com
+      serverEmail: wiki@example.com
+      showUserEmail: true
     features:
       mathjax: true
     externalLogging:
diff --git a/config.sample.yml b/config.sample.yml
index 5bfbf0b4..a686ce3c 100644
--- a/config.sample.yml
+++ b/config.sample.yml
@@ -127,9 +127,12 @@ git:
     privateKey: /etc/wiki/keys/git.pem
 
     sslVerify: true
-  signature:
-    name: Marty
-    email: marty@example.com
+
+  # Default email to use as commit author
+  serverEmail: marty@example.com
+
+  # Whether to use user email as author in commits
+  showUserEmail: true
 
 # ---------------------------------------------------------------------
 # Features
diff --git a/libs/git.js b/libs/git.js
index 3e172a63..8a49eaec 100644
--- a/libs/git.js
+++ b/libs/git.js
@@ -20,8 +20,7 @@ module.exports = {
     exists: false
   },
   _signature: {
-    name: 'Wiki',
-    email: 'user@example.com'
+    email: 'wiki@example.com'
   },
   _opts: {
     clone: {},
@@ -52,8 +51,7 @@ module.exports = {
     // Define signature
 
     if (appconfig.git) {
-      self._signature.name = appconfig.git.signature.name || 'Wiki'
-      self._signature.email = appconfig.git.signature.email || 'user@example.com'
+      self._signature.email = appconfig.git.serverEmail || 'wiki@example.com'
     }
 
     return self
@@ -102,7 +100,7 @@ module.exports = {
       self._url = URL.format(urlObj)
 
       let gitConfigs = [
-        () => { return self._git.exec('config', ['--local', 'user.name', self._signature.name]) },
+        () => { return self._git.exec('config', ['--local', 'user.name', 'Wiki']) },
         () => { return self._git.exec('config', ['--local', 'user.email', self._signature.email]) },
         () => { return self._git.exec('config', ['--local', '--bool', 'http.sslVerify', _.toString(appconfig.git.auth.sslVerify)]) }
       ]