Update account factory to prevent possible duplicates in the future