Added check for existing User