Make custom user work as expected

lets special case that for safety