diff --git a/modules/store/src/main/scala/docspell/store/records/RCollective.scala b/modules/store/src/main/scala/docspell/store/records/RCollective.scala
index 19ade621..2bbecaa6 100644
--- a/modules/store/src/main/scala/docspell/store/records/RCollective.scala
+++ b/modules/store/src/main/scala/docspell/store/records/RCollective.scala
@@ -97,11 +97,11 @@ object RCollective {
   def getSettings(coll: Ident): ConnectionIO[Option[Settings]] =
     (for {
       sett <- OptionT(getRawSettings(coll))
-      prev <- OptionT.fromOption[ConnectionIO](sett.classifier)
+      prev <- OptionT.pure[ConnectionIO](sett.classifier)
       cats <- OptionT.liftF(RTag.listCategories(coll))
-      next = prev.copy(categories = prev.categories.intersect(cats))
+      next = prev.map(p => p.copy(categories = p.categories.intersect(cats)))
       pws <- OptionT.liftF(RCollectivePassword.findAll(coll))
-    } yield sett.copy(classifier = Some(next), passwords = pws.map(_.password))).value
+    } yield sett.copy(classifier = next, passwords = pws.map(_.password))).value
 
   private def getRawSettings(coll: Ident): ConnectionIO[Option[Settings]] = {
     import RClassifierSetting.stringListMeta
diff --git a/modules/webapp/src/main/elm/Comp/NotificationChannelManage.elm b/modules/webapp/src/main/elm/Comp/NotificationChannelManage.elm
index dd302da6..7c26255d 100644
--- a/modules/webapp/src/main/elm/Comp/NotificationChannelManage.elm
+++ b/modules/webapp/src/main/elm/Comp/NotificationChannelManage.elm
@@ -302,7 +302,7 @@ viewForm texts settings outerModel model =
                 |> Maybe.map .id
 
         newChannel =
-            channelId |> (==) (Just "")
+            channelId == Just "" || channelId == Nothing
 
         headline =
             case Comp.ChannelForm.channelType model of