LB-669: User Type module
* adjusted