Fixed user problems