diff --git a/MakeMeAnAdmin.sh b/MakeMeAnAdmin.sh
index 5c2a54f..96737f4 100644
--- a/MakeMeAnAdmin.sh
+++ b/MakeMeAnAdmin.sh
@@ -18,7 +18,7 @@
 # find the logged in user and let them know #
 #############################################
 
-currentUser=$(who | awk '/console/{print $1}')
+currentUser=$(scutil <<< "show State:/Users/ConsoleUser" | awk '/Name :/ && ! /loginwindow/ { print $3 }')
 echo $currentUser
 
 osascript -e 'display dialog "You now have administrative rights for 30 minutes. DO NOT ABUSE THIS PRIVILEGE..." buttons {"Make me an admin, please"} default button 1'