Issue #423920: Prevent race condition in account generation code by adding uid to name