Fixed user troubles