Added a defined check for for_user