Make custom user work as expected