fixed special case for no user