fix current user role
Merge branch 'controller' into dev