Connection flow tweaks
Added User class