Added unique user check