Fix logic that checks watch key validity