Merge "Fix "can't create user" failure"