User module bug fix