added incremental username support