diff --git a/pass/Controllers/GitConfigSettingTableViewController.swift b/pass/Controllers/GitConfigSettingTableViewController.swift
index 3e2f7b7..cc49eba 100644
--- a/pass/Controllers/GitConfigSettingTableViewController.swift
+++ b/pass/Controllers/GitConfigSettingTableViewController.swift
@@ -10,6 +10,7 @@ import UIKit
 import SwiftyUserDefaults
 
 class GitConfigSettingTableViewController: UITableViewController {
+    let passwordStore = PasswordStore.shared
     
     @IBOutlet weak var nameTextField: UITextField!
     @IBOutlet weak var emailTextField: UITextField!
@@ -17,17 +18,22 @@ class GitConfigSettingTableViewController: UITableViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         tableView.rowHeight = UITableViewAutomaticDimension
+        
+        let signature = passwordStore.gitSignatureForNow
+        nameTextField.placeholder = signature.name
+        emailTextField.placeholder = signature.email
+        
         nameTextField.text = Defaults[.gitName]
         emailTextField.text = Defaults[.gitEmail]
     }
     
     override func shouldPerformSegue(withIdentifier identifier: String, sender: Any?) -> Bool {
         if identifier == "saveGitConfigSettingSegue" {
-            guard let name = nameTextField.text, !name.isEmpty else {
+            guard let name = nameTextField.text?.trimmingCharacters(in: .whitespaces), !name.isEmpty else {
                 Utils.alert(title: "Cannot Save", message: "Please set name first.", controller: self, completion: nil)
                 return false
             }
-            guard let email = emailTextField.text, !email.isEmpty else {
+            guard let email = emailTextField.text?.trimmingCharacters(in: .whitespaces), !email.isEmpty else {
                 Utils.alert(title: "Cannot Save", message: "Please set email first.", controller: self, completion: nil)
                 return false
             }
diff --git a/pass/Models/PasswordStore.swift b/pass/Models/PasswordStore.swift
index d9f4897..9a1b46b 100644
--- a/pass/Models/PasswordStore.swift
+++ b/pass/Models/PasswordStore.swift
@@ -84,8 +84,8 @@ class PasswordStore {
     
     var gitSignatureForNow: GTSignature {
         get {
-            let name = Defaults[.gitName] ?? Defaults[.gitUsername] ?? ""
-            let email = Defaults[.gitEmail] ?? (Defaults[.gitUsername] ?? "" + "@passforios")
+            let name = Defaults[.gitName] ?? Defaults[.gitUsername] ?? "user"
+            let email = Defaults[.gitEmail] ?? ((Defaults[.gitUsername] ?? "user") + "@passforios")
             return GTSignature(name: name, email: email, time: Date())!
         }
     }