fixed user issues