Add user type to auth user details
Merge remote-tracking branch 'origin/master'