User module fix