Fix user home stuff hopefully once and for all