diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..05bf648
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.local.sh
diff --git a/dotfiles/.gitconfig b/dotfiles/.gitconfig
index c002699..55a7921 100644
--- a/dotfiles/.gitconfig
+++ b/dotfiles/.gitconfig
@@ -1,6 +1,6 @@
 [user]
     name = Vasili Svirydau
-    email = vsvirydau@copperleaf.com
+    email = vasili.svirydau@sterlingcapitalbrokers.com
 
 [push]
     default = simple
@@ -31,5 +31,5 @@
 [rebase]
     instructionFormat = (%an <%ae>) %s
 [pull]
-	rebase = true
-	ff = only
+    rebase = true
+    ff = only
diff --git a/setup.d/20-gitconfig.sh b/setup.d/20-gitconfig.sh
new file mode 100644
index 0000000..fb14d18
--- /dev/null
+++ b/setup.d/20-gitconfig.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+DOTFILES=$( cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd || return)
+GITCONFIG="${DOTFILES}/bash.d/10-gitconfig.local.sh"
+
+if [[ -z "${GIT_AUTHOR_NAME}" ]]; then
+   read -p 'Git Author Name: ' GIT_AUTHOR_NAME
+fi
+
+if [[ -z "${GIT_AUTHOR_EMAIL}" ]]; then
+   read -p 'Git Author Email: ' GIT_AUTHOR_EMAIL
+fi
+
+cat > "$GITCONFIG" <<EOL
+#!/bin/bash
+export GIT_AUTHOR_NAME="${GIT_AUTHOR_NAME}"
+export GIT_AUTHOR_EMAIL="${GIT_AUTHOR_EMAIL}"
+EOL
+
+unset GIT_AUTHOR_NAME
+unset GIT_AUTHOR_EMAIL