User exists and other improvements