Fix default user handling.