Fixed existing user check