diff --git a/scripts/Common/Software/git/Manage.ps1 b/scripts/Common/Software/git/Manage.ps1
index b5343bd1..45313ced 100644
--- a/scripts/Common/Software/git/Manage.ps1
+++ b/scripts/Common/Software/git/Manage.ps1
@@ -59,6 +59,19 @@ $null = New-Module {
             }
         }
 
+        if ($User) {
+            $displayName = Get-UserConfig "displayName";
+            $mailAddress = Get-UserConfig "mailAddress";
+
+            if ($displayName) {
+                Set-GitConfig "user.name" $displayName;
+            }
+
+            if ($mailAddress) {
+                Set-GitConfig "user.email" $mailAddress;
+            }
+        }
+
         # Git Flow
         . {
             $dir = New-TemporaryDirectory;