diff --git a/raspi-config b/raspi-config
index 46239f51..1fa247aa 100755
--- a/raspi-config
+++ b/raspi-config
@@ -8,7 +8,7 @@ ASK_TO_REBOOT=0
 BLACKLIST=/etc/modprobe.d/raspi-blacklist.conf
 CONFIG=/boot/config.txt
 
-USER=${SUDO_USER:-$(who -m | awk '{ print $1 }')}
+USER="${SUDO_USER:-$(whoami)}"
 
 is_pi () {
   ARCH=$(dpkg --print-architecture)