Added user fullname
Refactor variable taken from yml and add alternative flow