Fix to allow lazy evaluation of user home