diff --git a/.bashrc b/.bashrc
index 7b8afcc..cd801cc 100644
--- a/.bashrc
+++ b/.bashrc
@@ -33,3 +33,8 @@ alias grep='grep --color=auto'
 # Configure TTY for pinentry
 GPG_TTY=$(tty)
 export GPG_TTY
+
+# Editor setup
+export ALTERNATE_EDITOR=""
+export EDITOR="emacsclient --tty"
+export VISUAL="emacsclient"
diff --git a/dotfiles/git/.config/pass-git-helper/git-pass-mapping.ini b/dotfiles/git/.config/pass-git-helper/git-pass-mapping.ini
index 0733d90..fd48b43 100644
--- a/dotfiles/git/.config/pass-git-helper/git-pass-mapping.ini
+++ b/dotfiles/git/.config/pass-git-helper/git-pass-mapping.ini
@@ -1,3 +1,5 @@
 [forge.1729.org.uk]
 target=dev/forge
-username=ray
+username_extractor=regex_search
+regex_username=^user: (.*)$
+