Definitive upgrade to User

Signed-off-by: AlexLalung <al@neomajes.com>