Fixed user issues