Added duplicate user check