diff --git a/mail_loop.sh b/mail_loop.sh
index 6965097..af5fb1f 100755
--- a/mail_loop.sh
+++ b/mail_loop.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # mymail_gmail_loop.sh
 
-MAILDIR=/tmp/$USERNAME-mail_loop
+MAILDIR=/tmp/$USER-mail_loop
 mkdir --mode=700 $MAILDIR 2>/dev/null
 
 while [ 1 ]; do
diff --git a/rc.lua b/rc.lua
index f088692..a6bacd0 100644
--- a/rc.lua
+++ b/rc.lua
@@ -11,7 +11,7 @@ require("autostart")
 --
 local home = os.getenv("HOME")
 local cfgpath = home.."/.config/awesome"
-local username = os.getenv("USERNAME")
+local username = os.getenv("USER")
 local terminal = "urxvt -tr +sb"
 local editor = os.getenv("EDITOR") or "vim"
 local editor_cmd = terminal .. " -e " .. editor