diff --git a/src/App/Page/Zone.purs b/src/App/Page/Zone.purs
index a9d656b..c05ac39 100644
--- a/src/App/Page/Zone.purs
+++ b/src/App/Page/Zone.purs
@@ -466,11 +466,12 @@ render state
           , Bulma.hr
           , Bulma.box_input ("flagCAA") "Flag" ""
               (updateForm Field_CAA_flag)
-              state._currentRR.target
+              (show (fromMaybe default_caa state._currentRR.caa).flag)
           , Bulma.selection_field'' "tagCAA" "Tag" CAA_tag (A.zip CAA.tags_txt CAA.tags_raw)
             CAA.Issue
             (Just (fromMaybe default_caa state._currentRR.caa).tag)
-          , Bulma.box_input "valueCAA" "Value" "" (updateForm Field_CAA_value) state._currentRR.name
+          , Bulma.box_input "valueCAA" "Value" "" (updateForm Field_CAA_value)
+            (fromMaybe default_caa state._currentRR.caa).value
           ]
         modal_content_srv :: Array (HH.HTML w Action)
         modal_content_srv =