Move User instance creation to adapter (see #201)