#1108 + small fix user module