Sync new-user fix from common area