diff --git a/modules/restserver/src/main/scala/docspell/restserver/conv/Conversions.scala b/modules/restserver/src/main/scala/docspell/restserver/conv/Conversions.scala
index 90c3e06a..a72a2d88 100644
--- a/modules/restserver/src/main/scala/docspell/restserver/conv/Conversions.scala
+++ b/modules/restserver/src/main/scala/docspell/restserver/conv/Conversions.scala
@@ -401,15 +401,15 @@ trait Conversions {
       org = ROrganization(
         oid,
         cid,
-        v.name,
-        v.address.street,
-        v.address.zip,
-        v.address.city,
-        v.address.country,
+        v.name.trim,
+        v.address.street.trim,
+        v.address.zip.trim,
+        v.address.city.trim,
+        v.address.country.trim,
         v.notes,
         now,
         now,
-        v.shortName
+        v.shortName.map(_.trim)
       )
     } yield OOrganization.OrgAndContacts(org, cont)
   }
@@ -426,15 +426,15 @@ trait Conversions {
       org = ROrganization(
         v.id,
         cid,
-        v.name,
-        v.address.street,
-        v.address.zip,
-        v.address.city,
-        v.address.country,
+        v.name.trim,
+        v.address.street.trim,
+        v.address.zip.trim,
+        v.address.city.trim,
+        v.address.country.trim,
         v.notes,
         v.created,
         now,
-        v.shortName
+        v.shortName.map(_.trim)
       )
     } yield OOrganization.OrgAndContacts(org, cont)
   }
@@ -463,11 +463,11 @@ trait Conversions {
       pers = RPerson(
         pid,
         cid,
-        v.name,
-        v.address.street,
-        v.address.zip,
-        v.address.city,
-        v.address.country,
+        v.name.trim,
+        v.address.street.trim,
+        v.address.zip.trim,
+        v.address.city.trim,
+        v.address.country.trim,
         v.notes,
         now,
         now,
@@ -489,11 +489,11 @@ trait Conversions {
       pers = RPerson(
         v.id,
         cid,
-        v.name,
-        v.address.street,
-        v.address.zip,
-        v.address.city,
-        v.address.country,
+        v.name.trim,
+        v.address.street.trim,
+        v.address.zip.trim,
+        v.address.city.trim,
+        v.address.country.trim,
         v.notes,
         v.created,
         now,
@@ -513,7 +513,7 @@ trait Conversions {
       pid: Option[Ident]
   ): F[RContact] =
     timeId.map { case (id, now) =>
-      RContact(id, c.value, c.kind, pid, oid, now)
+      RContact(id, c.value.trim, c.kind, pid, oid, now)
     }
 
   // users
@@ -564,11 +564,11 @@ trait Conversions {
 
   def newTag[F[_]: Sync](t: Tag, cid: Ident): F[RTag] =
     timeId.map { case (id, now) =>
-      RTag(id, cid, t.name, t.category, now)
+      RTag(id, cid, t.name.trim, t.category.map(_.trim), now)
     }
 
   def changeTag(t: Tag, cid: Ident): RTag =
-    RTag(t.id, cid, t.name, t.category, t.created)
+    RTag(t.id, cid, t.name.trim, t.category.map(_.trim), t.created)
 
   // sources
 
@@ -593,7 +593,7 @@ trait Conversions {
       RSource(
         id,
         cid,
-        s.abbrev,
+        s.abbrev.trim,
         s.description,
         0,
         s.enabled,
@@ -608,7 +608,7 @@ trait Conversions {
     RSource(
       s.id,
       coll,
-      s.abbrev,
+      s.abbrev.trim,
       s.description,
       s.counter,
       s.enabled,
@@ -624,13 +624,13 @@ trait Conversions {
 
   def newEquipment[F[_]: Sync](e: Equipment, cid: Ident): F[REquipment] =
     timeId.map({ case (id, now) =>
-      REquipment(id, cid, e.name, now, now, e.notes)
+      REquipment(id, cid, e.name.trim, now, now, e.notes)
     })
 
   def changeEquipment[F[_]: Sync](e: Equipment, cid: Ident): F[REquipment] =
     Timestamp
       .current[F]
-      .map(now => REquipment(e.id, cid, e.name, e.created, now, e.notes))
+      .map(now => REquipment(e.id, cid, e.name.trim, e.created, now, e.notes))
 
   // idref
 
diff --git a/modules/webapp/src/main/elm/App/Data.elm b/modules/webapp/src/main/elm/App/Data.elm
index 15782dc0..b047f250 100644
--- a/modules/webapp/src/main/elm/App/Data.elm
+++ b/modules/webapp/src/main/elm/App/Data.elm
@@ -11,6 +11,7 @@ import Browser exposing (UrlRequest)
 import Browser.Navigation exposing (Key)
 import Data.Flags exposing (Flags)
 import Data.UiSettings exposing (UiSettings)
+import Data.UiTheme exposing (UiTheme)
 import Http
 import Page exposing (Page(..))
 import Page.CollectiveSettings.Data
@@ -46,6 +47,7 @@ type alias Model =
     , subs : Sub Msg
     , uiSettings : UiSettings
     , sidebarVisible : Bool
+    , anonymousTheme : UiTheme
     }
 
 
@@ -94,6 +96,7 @@ init key url flags_ settings =
       , subs = Sub.none
       , uiSettings = settings
       , sidebarVisible = settings.sideMenuVisible
+      , anonymousTheme = Data.UiTheme.Light
       }
     , Cmd.batch
         [ Cmd.map UserSettingsMsg uc
diff --git a/modules/webapp/src/main/elm/App/Update.elm b/modules/webapp/src/main/elm/App/Update.elm
index e3883da8..63e3aceb 100644
--- a/modules/webapp/src/main/elm/App/Update.elm
+++ b/modules/webapp/src/main/elm/App/Update.elm
@@ -52,18 +52,18 @@ updateWithSub msg model =
             ( { model | sidebarVisible = not model.sidebarVisible }, Cmd.none, Sub.none )
 
         ToggleDarkMode ->
-            let
-                settings =
-                    model.uiSettings
-
-                next =
-                    Data.UiTheme.cycle settings.uiTheme
-
-                newSettings =
-                    { settings | uiTheme = next }
-            in
             case model.flags.account of
                 Just _ ->
+                    let
+                        settings =
+                            model.uiSettings
+
+                        next =
+                            Data.UiTheme.cycle settings.uiTheme
+
+                        newSettings =
+                            { settings | uiTheme = next }
+                    in
                     -- when authenticated, store it in settings only
                     -- once new settings arrive via a subscription,
                     -- the ui is updated. so it is also updated on
@@ -74,8 +74,12 @@ updateWithSub msg model =
                     )
 
                 Nothing ->
+                    let
+                        next =
+                            Data.UiTheme.cycle model.anonymousTheme
+                    in
                     -- when not logged in, simply set the theme
-                    ( { model | userMenuOpen = False }
+                    ( { model | userMenuOpen = False, anonymousTheme = next }
                     , Ports.setUiTheme next
                     , Sub.none
                     )