diff --git a/setup/so-functions b/setup/so-functions
index bd16f9cd2..38077269f 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1321,7 +1321,7 @@ elasticsearch_pillar() {
 
 parse_install_username() {
 	# parse out the install username so things copy correctly
-    INSTALLUSERNAME=$(pwd | sed -E 's/\// /g'  | awk '{ print $2 }')
+	INSTALLUSERNAME=${SUDO_USER:-${USER}}
 }
 
 patch_pillar() {