Restrict users by user_type
Merge branch 'restrict-user-type'