User module. Bug fixing