fixes for rare race condition and default users not getting aliases