Getting rid of deprecated luser variable
Merge conflict - adding in boxen_user replacement