Merge "Don't crash if a user can't be created" into lmp-dev