fix :other user_type
nicer user display
Merge branch 'observer'