diff --git a/config.yaml b/config.yaml
index 0bfa980..2a0149d 100644
--- a/config.yaml
+++ b/config.yaml
@@ -37,7 +37,7 @@ variables:
             user: lelgenio
             mail: disroot.org
         work:
-            user: leonardo
+            user: leonardo@wopus.com.br
             mail: wopus.com.br
 
 ###############################################################
diff --git a/dotfiles/git/config-work b/dotfiles/git/config-work
index 47c4f9b..8dd86f8 100644
--- a/dotfiles/git/config-work
+++ b/dotfiles/git/config-work
@@ -1,5 +1,5 @@
 [user]
-    name = {{@@ mail.work.user | capitalize @@}}
-    email = {{@@ mail.work.user @@}}@{{@@ mail.work.mail @@}}
+    name = {{@@ mail.work.user.split("@")[0] | capitalize @@}}
+    email = {{@@ mail.work.user.split("@")[0] @@}}@{{@@ mail.work.mail @@}}
 
 # vim: ft=ini
diff --git a/dotfiles/neomutt/mbsyncrc b/dotfiles/neomutt/mbsyncrc
index 6747507..adecfd8 100644
--- a/dotfiles/neomutt/mbsyncrc
+++ b/dotfiles/neomutt/mbsyncrc
@@ -3,7 +3,7 @@
 IMAPStore {{@@ name @@}}-remote
 Host {{@@ info.mail @@}}
 Port  993
-User {{@@ info.user @@}}@{{@@ info.mail @@}}
+User {{@@ info.user.split("@")[0] @@}}@{{@@ info.mail @@}}
 PassCmd "_pass_get {{@@ info.mail @@}}"
 SSLType IMAPS
 CertificateFile /etc/ssl/certs/ca-certificates.crt
diff --git a/dotfiles/neomutt/neomuttrc b/dotfiles/neomutt/neomuttrc
index d7521eb..c87c295 100644
--- a/dotfiles/neomutt/neomuttrc
+++ b/dotfiles/neomutt/neomuttrc
@@ -19,7 +19,7 @@ set ssl_force_tls = yes
 
 {%@@ for name, info in mail.items() | reverse @@%}
 set my_source_command = \
-  "_mutt_get-mail '{{@@ name @@}}' '{{@@ info.user @@}}' '{{@@ info.mail @@}}' |"
+  "_mutt_get-mail '{{@@ name @@}}' '{{@@ info.user.split("@")[0] @@}}' '{{@@ info.user @@}}' '{{@@ info.mail @@}}' |"
 
   folder-hook "$my_mailroot/{{@@ name @@}}/" \
     source "\"$my_source_command\""
@@ -28,7 +28,7 @@ set my_source_command = \
 
 {%@@ for name, info in mail.items() @@%}
   set my_source_command = \
-    "_mutt_get-mail '{{@@ name @@}}' '{{@@ info.user @@}}' '{{@@ info.mail @@}}' |"
+    "_mutt_get-mail '{{@@ name @@}}' '{{@@ info.user.split("@")[0] @@}}' '{{@@ info.user @@}}' '{{@@ info.mail @@}}' |"
   macro index,pager <f{{@@ loop.index @@}}> "<sync-mailbox><enter-command>source \"$my_source_command\"<enter><change-folder>!<enter>"
 {%@@ endfor @@%}
 
diff --git a/dotfiles/scripts/_mutt_get-mail b/dotfiles/scripts/_mutt_get-mail
index f41e178..183678d 100755
--- a/dotfiles/scripts/_mutt_get-mail
+++ b/dotfiles/scripts/_mutt_get-mail
@@ -1,14 +1,16 @@
 #!/bin/sh
 
 my_path="$1"
-my_user="$2"
-my_host="$3"
+my_name="$2"
+my_user="$3"
+my_host="$4"
 my_pass=`_pass_get "$my_host"`
 
 cat <<EOF
-set realname = "$my_user"
-set from = "${my_user}@${my_host}"
-set smtp_url = "smtps://${my_user}:${my_pass}@${my_host}"
+set realname = "$my_name"
+set from = "${my_name}@${my_host}"
+set smtp_url = 'smtps://${my_user}@${my_host}'
+set smtp_pass = '$my_pass'
 
 # set Mailboxes
 set folder = ~/.local/share/mail/${my_path}/