Fixed user parsing