diff --git a/modules/webapp/src/main/elm/Comp/NotificationMailForm.elm b/modules/webapp/src/main/elm/Comp/NotificationMailForm.elm
index 0faa0563..93467ae8 100644
--- a/modules/webapp/src/main/elm/Comp/NotificationMailForm.elm
+++ b/modules/webapp/src/main/elm/Comp/NotificationMailForm.elm
@@ -74,6 +74,7 @@ initWith flags channel =
         | channel = Data.NotificationChannel.setTypeMail channel
         , recipients = channel.recipients
         , connectionModel = cm
+        , name = channel.name
       }
     , mc
     )
diff --git a/modules/webapp/src/main/elm/Comp/PeriodicQueryTaskForm.elm b/modules/webapp/src/main/elm/Comp/PeriodicQueryTaskForm.elm
index 8560b331..76f6618f 100644
--- a/modules/webapp/src/main/elm/Comp/PeriodicQueryTaskForm.elm
+++ b/modules/webapp/src/main/elm/Comp/PeriodicQueryTaskForm.elm
@@ -116,7 +116,7 @@ initWith flags s =
       , queryModel = res.model
       , channelModel = cfm
       , bookmarkDropdown = bm
-      , contentStart = Nothing
+      , contentStart = s.contentStart
       , formState = FormStateInitial
       , loading = 0
       , summary = s.summary