diff --git a/lib/RT/Interface/Web.pm b/lib/RT/Interface/Web.pm
index bf9639bcbb8..1b185c53ac0 100644
--- a/lib/RT/Interface/Web.pm
+++ b/lib/RT/Interface/Web.pm
@@ -6479,6 +6479,38 @@ sub GetDefaultDashboard {
     return $dashboard;
 }
 
+=head2 GetInvalidFields Object => $Object
+
+Returns a list of fields that are marked as invalid by server.
+
+=cut
+
+sub GetInvalidFields {
+    my %args = @_;
+    my @fields;
+    foreach my $note ( keys %{$m->notes} ) {
+        if ( $note =~ /^InvalidField\-(\d+)(?:-(.+))?/ ) {
+            my $cf_id    = $1;
+            my $grouping = $2;
+            my $cf = RT::CustomField->new($session{'CurrentUser'});
+            my ($ok, $msg) = $cf->Load($cf_id);
+            if ( $cf->Id ) {
+                push @fields,
+                    GetCustomFieldInputName(
+                        CustomField => $cf,
+                        Grouping    => $grouping,
+                        # Do not pass misleading ticket object in case it's a txn cf.
+                        $cf->ObjectTypeFromLookupType eq ref $args{Object} ? ( Object => $args{Object} ) : (),
+                    );
+            }
+            else {
+                RT->Logger->error("Unable to load custom field $cf_id: $msg") unless $ok;
+            }
+        }
+    }
+    return @fields;
+}
+
 package RT::Interface::Web;
 RT::Base->_ImportOverlays();
 
diff --git a/share/html/Asset/Create.html b/share/html/Asset/Create.html
index f439df7fb89..b43b7aa6b4f 100644
--- a/share/html/Asset/Create.html
+++ b/share/html/Asset/Create.html
@@ -155,6 +155,17 @@
         }
     } else {
         push @results, @cf_errors;
+
+        if ( !$cf_ok && RT::Interface::Web::RequestENV('HTTP_HX_BOOSTED') ) {
+            $r->headers_out->{'HX-Trigger'} = JSON(
+                {
+                    actionsChanged   => { messages => \@results, isWarning => 1 },
+                    validationFailed => [ GetInvalidFields( Object => RT::Asset->new( $session{CurrentUser} ) ) ],
+                },
+                ascii => 1,
+            );
+            Abort( loc("Validation error"), Code => HTTP::Status::HTTP_UNPROCESSABLE_CONTENT );
+        }
     }
 }
 
diff --git a/share/html/Elements/EditCustomField b/share/html/Elements/EditCustomField
index 38eec673c07..32323a9be04 100644
--- a/share/html/Elements/EditCustomField
+++ b/share/html/Elements/EditCustomField
@@ -63,13 +63,15 @@ $m->comp(
     CustomField => $CustomField,
     Name => $Name,
     $CustomField->BasedOn && $Name ? ( BasedOnName => GetCustomFieldInputName(Object => $Object, CustomField => $CustomField->BasedOnObj, Grouping => $Grouping) ) : (),
+    DescribedBy => $CFHintId,
+    AddClass => $AddClass,
   );
 
-if (my $msg = $m->notes('InvalidField-' . $CustomField->Id)) {
+if ( $error_msg ) {
 </%perl>
-        <span class="cfinvalidfield my-1 d-inline-block"><% $msg %></span>
+        <span id="<% $CFHintId %>" class="form-text invalid-feedback cfinvalidfield d-inline-block"><% $error_msg %></span>
 %  } elsif ($ShowHints and $CustomField->FriendlyPattern) {
-        <span class="cfhints my-1 d-inline-block">
+        <span id="<% $CFHintId %>" class="form-text cfhints d-inline-block">
           <% $CustomField->FriendlyPattern %>
         </span>
 %  }
@@ -106,6 +108,13 @@ if ( !$NamePrefix ) {
     $Name = GetCustomFieldInputName(Object => $Object, CustomField => $CustomField, Grouping => $Grouping );
 }
 
+my $CFHintId;
+my $cf_name_prefix = GetCustomFieldInputNamePrefix(Object => $Object, CustomField => $CustomField, Grouping => $Grouping );
+
+if ($ShowHints and $CustomField->FriendlyPattern) {
+    $CFHintId = $cf_name_prefix . 'Hint';
+}
+
 # Always fill $Default with submited values if it's empty
 if ( ( !defined $Default || !length $Default ) && $DefaultsFromTopArguments ) {
     my %TOP = %$DECODED_ARGS;
@@ -116,8 +125,7 @@ if ( ( !defined $Default || !length $Default ) && $DefaultsFromTopArguments ) {
             // $TOP{ $NamePrefix . $CustomField->Id . '-Value' };
     }
     else {
-        my $prefix = GetCustomFieldInputNamePrefix(Object => $Object, CustomField => $CustomField, Grouping => $Grouping );
-        $Default //= $TOP{ $prefix . 'Values' } // $TOP{ $prefix . 'Value' };
+        $Default //= $TOP{ $cf_name_prefix . 'Values' } // $TOP{ $cf_name_prefix . 'Value' };
     }
 }
 
@@ -164,6 +172,12 @@ if ( RT->Config->Get('ExternalInfoPriority') && $Object && $Object->isa('RT::Use
     }
 }
 
+my ($error_msg, $AddClass);
+if ( $m->notes('InvalidField-' . $CustomField->Id . ($Grouping ? "-$Grouping" : '') ) ) {
+    $error_msg = $m->notes( 'InvalidField-' . $CustomField->Id . ($Grouping ? "-$Grouping" : '') );
+    $AddClass = 'is-invalid';
+}
+
 my $EditComponent = "EditCustomField$Type";
 $m->callback( %ARGS, CallbackName => 'EditComponentName', Name => \$EditComponent, CustomField => $CustomField, Object => $Object, Rows => \$Rows, Cols => \$Cols);
 $EditComponent = "EditCustomField$Type" unless $m->comp_exists($EditComponent);
diff --git a/share/html/Elements/EditCustomFieldAutocomplete b/share/html/Elements/EditCustomFieldAutocomplete
index 78e6baa46a3..998ae48d994 100644
--- a/share/html/Elements/EditCustomFieldAutocomplete
+++ b/share/html/Elements/EditCustomFieldAutocomplete
@@ -53,7 +53,10 @@ cols="<% $Cols %>" \
 % if ( defined $Rows ) {
 rows="<% $Rows %>" \
 % }
-name="<% $name %>" id="<% $name %>" class="CF-<%$CustomField->id%>-Edit form-control"><% $Default || '' %></textarea>
+% if ( defined $DescribedBy ) {
+aria-describedby="<% $DescribedBy %>" \
+% }
+name="<% $name %>" id="<% $name %>" class="CF-<%$CustomField->id%>-Edit form-control <% $AddClass // '' %>"><% $Default || '' %></textarea>
 
 <script type="text/javascript">
 var id = <% "$name" |n,j%>;
@@ -78,7 +81,11 @@ jQuery('#'+id).autocomplete( {
 }
 );
 % } else {
-<input type="text" id="<% $name %>" name="<% $name %>" class="CF-<%$CustomField->id%>-Edit form-control" value="<% $Default || '' %>"/>
+<input type="text" id="<% $name %>" name="<% $name %>" \
+% if ( defined $DescribedBy ) {
+aria-describedby="<% $DescribedBy %>" \
+% }
+class="CF-<%$CustomField->id%>-Edit form-control <% $AddClass // '' %>" value="<% $Default || '' %>"/>
 <script type="text/javascript">
 var id = <% $name |n,j%>;
 id = id.replace(/:/g,'\\:');
@@ -114,4 +121,6 @@ $Values      => undef
 $Multiple    => undef
 $Rows        => undef
 $Cols        => undef
+$DescribedBy => undef
+$AddClass => undef
 </%ARGS>
diff --git a/share/html/Elements/EditCustomFieldBinary b/share/html/Elements/EditCustomFieldBinary
index 2be3745d440..267cbad31fc 100644
--- a/share/html/Elements/EditCustomFieldBinary
+++ b/share/html/Elements/EditCustomFieldBinary
@@ -48,7 +48,11 @@
 % while ( $Values and my $value = $Values->Next ) {
 %# XXX - let user download the file(s) here?
 <div class="form-check">
-  <input type="checkbox" id="<% $delete_name . $value->id %>" name="<%$delete_name%>" class="form-check-input CF-<%$CustomField->id%>-Edit" value="<% $value->Id %>">
+  <input type="checkbox" id="<% $delete_name . $value->id %>" name="<%$delete_name%>" \
+% if ( defined $DescribedBy ) {
+aria-describedby="<% $DescribedBy %>" \
+% }
+class="form-check-input CF-<%$CustomField->id%>-Edit <% $AddClass // '' %>" value="<% $value->Id %>">
   <label class="form-check-label" for="<% $delete_name . $value->id %>">
 % if (my $url = RT->System->ExternalStorageURLFor($value)) {
 <a hx-boost="false" href="<%$url%>">
@@ -83,4 +87,6 @@ $Name   => undef
 $Default => undef
 $Values => undef
 $MaxValues => undef
+$DescribedBy => undef
+$AddClass => undef
 </%ARGS>
diff --git a/share/html/Elements/EditCustomFieldCombobox b/share/html/Elements/EditCustomFieldCombobox
index 642ae27c1ea..2dc91039e95 100644
--- a/share/html/Elements/EditCustomFieldCombobox
+++ b/share/html/Elements/EditCustomFieldCombobox
@@ -47,7 +47,11 @@
 %# END BPS TAGGED BLOCK }}}
 % while ($Values and my $value = $Values->Next and $Multiple) {
 <div class="form-check">
-  <input type="checkbox" name="<% $delete_name %>" id="<% $delete_name %>-<% $value->Id %>" value="<% $value->Id %>" class="CF-<%$CustomField->id%>-Edit checkbox form-check-input" />
+  <input type="checkbox" name="<% $delete_name %>" id="<% $delete_name %>-<% $value->Id %>" \
+% if ( defined $DescribedBy ) {
+aria-describedby="<% $DescribedBy %>" \
+% }
+value="<% $value->Id %>" class="CF-<%$CustomField->id%>-Edit checkbox form-check-input <% $AddClass // '' %>" />
   <label class="form-check-label" for="<% $delete_name %>-<% $value->Id %>"><% $value->Content %></label>
 </div>
 % }
@@ -76,4 +80,6 @@ $Multiple => 0
 $Rows => undef
 $MaxValues => undef
 $Name => undef
+$DescribedBy => undef
+$AddClass => undef
 </%ARGS>
diff --git a/share/html/Elements/EditCustomFieldDate b/share/html/Elements/EditCustomFieldDate
index 338056a2ceb..d3c16dfb889 100644
--- a/share/html/Elements/EditCustomFieldDate
+++ b/share/html/Elements/EditCustomFieldDate
@@ -48,7 +48,7 @@
 % my $name = $Name || $NamePrefix.$CustomField->Id.'-Values';
 <div class="row">
   <div class="col-auto">
-    <& /Elements/SelectDate, Name => $name, Default => $Default, current => 0, ShowTime => 0 &>
+    <& /Elements/SelectDate, Name => $name, Default => $Default, current => 0, ShowTime => 0, DescribedBy => $DescribedBy, AddClass => $AddClass &>
   </div>
 </div>
 <%ARGS>
@@ -59,4 +59,6 @@ $Default => undef
 $Values => undef
 $MaxValues => 1
 $Name => undef
+$DescribedBy => undef
+$AddClass => undef
 </%ARGS>
diff --git a/share/html/Elements/EditCustomFieldDateTime b/share/html/Elements/EditCustomFieldDateTime
index fc5b66172dd..fa54c668c5f 100644
--- a/share/html/Elements/EditCustomFieldDateTime
+++ b/share/html/Elements/EditCustomFieldDateTime
@@ -48,7 +48,7 @@
 % my $name = $Name || $NamePrefix.$CustomField->Id.'-Values';
 <div class="row">
     <div class="col-auto">
-        <& /Elements/SelectDate, Name => $name, Default => $Default, current => 0 &>
+        <& /Elements/SelectDate, Name => $name, Default => $Default, current => 0, DescribedBy => $DescribedBy, AddClass => $AddClass &>
     </div>
 </div>
 
@@ -61,4 +61,6 @@ $Values => undef
 $MaxValues => 1
 $Name => undef
 $Format => 'unknown'
+$DescribedBy => undef
+$AddClass => undef
 </%ARGS>
diff --git a/share/html/Elements/EditCustomFieldFreeform b/share/html/Elements/EditCustomFieldFreeform
index edb78825455..e22a65c01df 100644
--- a/share/html/Elements/EditCustomFieldFreeform
+++ b/share/html/Elements/EditCustomFieldFreeform
@@ -54,13 +54,19 @@ cols="<% $Cols %>" \
 % if ( defined $Rows ) {
 rows="<% $Rows %>" \
 % }
-name="<%$name%>" id="<%$name%>" wrap="off" class="CF-<%$CustomField->id%>-Edit form-control"><% defined($Default) ? $Default : '' %></textarea>
+% if ( defined $DescribedBy ) {
+aria-describedby="<% $DescribedBy %>" \
+% }
+name="<%$name%>" id="<%$name%>" wrap="off" class="CF-<%$CustomField->id%>-Edit form-control <% $AddClass // '' %>"><% defined($Default) ? $Default : '' %></textarea>
 % } else {
 <input type="text" name="<%$name%>" id="<%$name%>" \
 % if ( defined $Cols ) {
 size="<% $Cols %>" \
 % }
-class="CF-<%$CustomField->id%>-Edit form-control" value="<% defined($Default) ? $Default : ''%>" />
+% if ( defined $DescribedBy ) {
+aria-describedby="<% $DescribedBy %>" \
+% }
+class="CF-<%$CustomField->id%>-Edit form-control <% $AddClass // '' %>" value="<% defined($Default) ? $Default : ''%>" />
 % }
 <%INIT>
 if ( $Multiple and $Values ) {
@@ -80,4 +86,6 @@ $Values => undef
 $Multiple => undef
 $Cols
 $Rows
+$DescribedBy => undef
+$AddClass => undef
 </%ARGS>
diff --git a/share/html/Elements/EditCustomFieldHTML b/share/html/Elements/EditCustomFieldHTML
index b52f93cf59d..a8e5d90e064 100644
--- a/share/html/Elements/EditCustomFieldHTML
+++ b/share/html/Elements/EditCustomFieldHTML
@@ -54,7 +54,10 @@ cols="<% $Cols %>" \
 % if ( defined $Rows ) {
 rows="<% $Rows %>" \
 % }
-name="<%$name%>" class="CF-<%$CustomField->id%>-Edit form-control richtext"><% $value->Content %></textarea><br />
+% if ( defined $DescribedBy ) {
+aria-describedby="<% $DescribedBy %>" \
+% }
+name="<%$name%>" class="CF-<%$CustomField->id%>-Edit form-control richtext <% $AddClass // '' %>"><% $value->Content %></textarea><br />
 % }
 % if (!$MaxValues or !$Values or $Values->Count < $MaxValues) {
 <textarea \
@@ -64,7 +67,10 @@ cols="<% $Cols %>" \
 % if ( defined $Rows ) {
 rows="<% $Rows %>" \
 % }
-name="<%$name%>" class="CF-<%$CustomField->id%>-Edit form-control richtext"><% $Default %></textarea>
+% if ( defined $DescribedBy ) {
+aria-describedby="<% $DescribedBy %>" \
+% }
+name="<%$name%>" class="CF-<%$CustomField->id%>-Edit form-control richtext <% $AddClass // '' %>"><% $Default %></textarea>
 % }
 <%INIT>
 # XXX - MultiValue textarea is for now outlawed.
@@ -81,4 +87,6 @@ $Values => undef
 $MaxValues => undef
 $Cols
 $Rows
+$DescribedBy => undef
+$AddClass => undef
 </%ARGS>
diff --git a/share/html/Elements/EditCustomFieldSelect b/share/html/Elements/EditCustomFieldSelect
index bb6d37b7d6c..663de70bf00 100644
--- a/share/html/Elements/EditCustomFieldSelect
+++ b/share/html/Elements/EditCustomFieldSelect
@@ -122,7 +122,7 @@
 <select
   name="<%$name%>" id="<%$name%>"
 
-    class="CF-Edit CF-<%$CustomField->id%>-Edit form-select selectpicker"
+    class="CF-Edit CF-<%$CustomField->id%>-Edit form-select selectpicker <% $AddClass // '' %>"
 %   if ( $use_live_search ) {
     data-live-search="true"
 %   }
@@ -133,6 +133,9 @@
 % if ( $size > 1 ) {
   size="<% $Rows %>"
 % }
+% if ( defined $DescribedBy ) {
+aria-describedby="<% $DescribedBy %>" \
+% }
 <% $Multiple && qq[multiple="multiple"] |n %> >
 % if ( $show_empty_option ) {
 <option value=""<% !$selected && qq[ selected="selected"] |n %>><&|/l&>(no value)</&></option>
@@ -202,6 +205,8 @@ $Rows => undef
 $HideCategory => 0
 $RenderType => undef
 $MaxValues => 1
+$DescribedBy => undef
+$AddClass => undef
 </%ARGS>
 
 <%METHOD options>
diff --git a/share/html/Elements/EditCustomFieldText b/share/html/Elements/EditCustomFieldText
index e9f851e664b..ca6dd44656a 100644
--- a/share/html/Elements/EditCustomFieldText
+++ b/share/html/Elements/EditCustomFieldText
@@ -53,7 +53,10 @@ cols="<% $Cols %>" \
 % if ( defined $Rows ) {
 rows="<% $Rows %>" \
 % }
-name="<%$name%>" class="CF-<%$CustomField->id%>-Edit form-control"><% $value->Content %></textarea><br />
+% if ( defined $DescribedBy ) {
+aria-describedby="<% $DescribedBy %>" \
+% }
+name="<%$name%>" class="CF-<%$CustomField->id%>-Edit form-control <% $AddClass // '' %>"><% $value->Content %></textarea><br />
 % }
 % if (!$MaxValues or !$Values or $Values->Count < $MaxValues) {
 <textarea \
@@ -63,7 +66,10 @@ cols="<% $Cols %>" \
 % if ( defined $Rows ) {
 rows="<% $Rows %>" \
 % }
-name="<%$name%>" class="CF-<%$CustomField->id%>-Edit form-control"><% defined($Default) ? $Default : '' %></textarea>
+% if ( defined $DescribedBy ) {
+aria-describedby="<% $DescribedBy %>" \
+% }
+name="<%$name%>" class="CF-<%$CustomField->id%>-Edit form-control <% $AddClass // '' %>"><% defined($Default) ? $Default : '' %></textarea>
 % }
 <%INIT>
 # XXX - MultiValue textarea is for now outlawed.
@@ -80,4 +86,6 @@ $Values => undef
 $MaxValues => undef
 $Cols
 $Rows
+$DescribedBy => undef
+$AddClass => undef
 </%ARGS>
diff --git a/share/html/Elements/EditCustomFieldWikitext b/share/html/Elements/EditCustomFieldWikitext
index 6e51fa1abaf..437644931e0 100644
--- a/share/html/Elements/EditCustomFieldWikitext
+++ b/share/html/Elements/EditCustomFieldWikitext
@@ -53,7 +53,10 @@ cols="<% $Cols %>" \
 % if ( defined $Rows ) {
 rows="<% $Rows %>" \
 % }
-name="<%$name%>" class="CF-<%$CustomField->id%>-Edit form-control"><% $value->Content %></textarea><br />
+% if ( defined $DescribedBy ) {
+aria-describedby="<% $DescribedBy %>" \
+% }
+name="<%$name%>" class="CF-<%$CustomField->id%>-Edit form-control <% $AddClass // '' %>"><% $value->Content %></textarea><br />
 % }
 % if (!$MaxValues or !$Values or $Values->Count < $MaxValues) {
 <textarea \
@@ -63,7 +66,10 @@ cols="<% $Cols %>" \
 % if ( defined $Rows ) {
 rows="<% $Rows %>" \
 % }
-name="<%$name%>" class="CF-<%$CustomField->id%>-Edit form-control"><% $Default %></textarea>
+% if ( defined $DescribedBy ) {
+aria-describedby="<% $DescribedBy %>" \
+% }
+name="<%$name%>" class="CF-<%$CustomField->id%>-Edit form-control <% $AddClass // '' %>"><% $Default %></textarea>
 % }
 <%INIT>
 # XXX - MultiValue textarea is for now outlawed.
@@ -80,4 +86,6 @@ $Values => undef
 $MaxValues => undef
 $Cols
 $Rows
+$DescribedBy => undef
+$AddClass => undef
 </%ARGS>
diff --git a/share/html/Elements/SelectDate b/share/html/Elements/SelectDate
index c6690b2b659..11898d351fc 100644
--- a/share/html/Elements/SelectDate
+++ b/share/html/Elements/SelectDate
@@ -46,11 +46,14 @@
 %#
 %# END BPS TAGGED BLOCK }}}
 % $m->callback( %ARGS, Name => $Name, CallbackName => 'BeforeDateInput', Object => $Object, ARGSRef => $ARGSRef, ShowTimeRef => \$ShowTime, );
-<input type="text" class="datepicker<% $ShowTime ? ' withtime' : '' %> form-control"
+<input type="text" class="datepicker<% $ShowTime ? ' withtime' : '' %> form-control <% $AddClass // '' %>" \
 % if ( $id ) {
- id="<% $id %>"
+id="<% $id %>" \
 % }
- name="<% $Name %>" value="<% $Default %>" autocomplete="off" placeholder="" />
+% if ( defined $DescribedBy ) {
+aria-describedby="<% $DescribedBy %>" \
+% }
+name="<% $Name %>" value="<% $Default %>" autocomplete="off" placeholder="" />
 % $m->callback( %ARGS, Name => $Name, CallbackName => 'AfterDateInput', Object => $Object, ARGSRef => $ARGSRef, );
 <%init>
 unless ((defined $Default) or ($current <= 0)) {
@@ -77,4 +80,6 @@ $Name        => undef
 $Object      => undef
 $ARGSRef     => undef
 $id          => undef
+$DescribedBy => undef
+$AddClass    => undef
 </%args>
diff --git a/share/html/Elements/ValidateCustomFields b/share/html/Elements/ValidateCustomFields
index 26e566ecc62..9eb3a1c24fb 100644
--- a/share/html/Elements/ValidateCustomFields
+++ b/share/html/Elements/ValidateCustomFields
@@ -52,107 +52,109 @@ $CustomFields->GotoFirstItem;
 my $CFArgs = _ParseObjectCustomFieldArgs( $ARGSRef )->{ref($Object)}{$Object->Id || 0} || {};
 
 while ( my $CF = $CustomFields->Next ) {
-    my $submitted = $CFArgs->{$CF->Id};
-    # Pick the first grouping
-    $submitted = $submitted ? $submitted->{(keys %$submitted)[0]} : {};
+    my $submitted = $CFArgs->{ $CF->Id } || { '' => {} };
+    for my $grouping ( sort keys %$submitted ) {
+        my $submitted = $submitted->{$grouping};
 
-    # If we don't have a value and we don't see the Magic, then we're not
-    # submitting a field.
-    next if not $ValidateUnsubmitted
-        and not exists $submitted->{"Value"}
-        and not exists $submitted->{"Upload"}
-        and not exists $submitted->{"Values"}
-        and not $submitted->{"Values-Magic"};
+        # If we don't have a value and we don't see the Magic, then we're not
+        # submitting a field.
+        next if not $ValidateUnsubmitted
+            and not exists $submitted->{"Value"}
+            and not exists $submitted->{"Upload"}
+            and not exists $submitted->{"Values"}
+            and not $submitted->{"Values-Magic"};
 
-    # We only validate Single Combos -- multis can never be user input
-    next if $submitted->{"Values-Magic"} and exists $submitted->{"Values"}
-        and ref $submitted->{"Values"};
+        # We only validate Single Combos -- multis can never be user input
+        next if $submitted->{"Values-Magic"} and exists $submitted->{"Values"}
+            and ref $submitted->{"Values"};
 
-    my ( $invalid, $invalid_message );
-    $m->callback(
-        CallbackName    => 'ValidateValue',
-        Object          => $Object,
-        CustomField     => $CF,
-        Value           => \( $submitted->{Values} // $submitted->{Value} // $submitted->{Upload} ),
-        ARGSRef         => $ARGSRef,
-        CustomFieldArgs => $CFArgs,
-        Invalid         => \$invalid,
-        InvalidMessage  => \$invalid_message,
-    );
+        my ( $invalid, $invalid_message );
+        $m->callback(
+            CallbackName    => 'ValidateValue',
+            Object          => $Object,
+            CustomField     => $CF,
+            Value           => \( $submitted->{Values} // $submitted->{Value} // $submitted->{Upload} ),
+            ARGSRef         => $ARGSRef,
+            CustomFieldArgs => $CFArgs,
+            Invalid         => \$invalid,
+            InvalidMessage  => \$invalid_message,
+        );
 
-    $m->notes(('Field-' . $CF->Id) => $submitted->{Values} // $submitted->{Value});
+        $m->notes(('Field-' . $CF->Id) => $submitted->{Values} // $submitted->{Value});
 
-    # Validation messages can display an alternate label if the RT UI
-    # shows something other than the default CF Name. To use a different
-    # label, provide %Labels with the CF name as the key and the alternate
-    # label as the value.
+        # Validation messages can display an alternate label if the RT UI
+        # shows something other than the default CF Name. To use a different
+        # label, provide %Labels with the CF name as the key and the alternate
+        # label as the value.
 
-    my $label = $Labels{$CF->Name} || $CF->Name;
-    if ( $invalid ) {
-        $m->notes( 'InvalidField-' . $CF->Id => $invalid_message );
-        push @res, $label . ': ' . $invalid_message;
-        $valid = 0;
-        next;
-    }
-
-    my @values = _NormalizeObjectCustomFieldValue(
-        CustomField => $CF,
-        Value       => ($submitted->{Values} // $submitted->{Value} // $submitted->{Upload}),
-    );
-    if ($CF->Type =~ /^Date(?:Time)?$/) {
-        @values = grep {
-            my $DateObj = RT::Date->new ( $session{'CurrentUser'} );
-            $DateObj->Set(
-                Format => 'unknown',
-                Value => $_,
-                ($CF->Type eq "Date" ? (Timezone => 'utc') : ())
-            );
-            $DateObj->IsSet
-        } @values;
-    }
-    push @values, '' unless @values;
-
-    for my $value( @values ) {
-        if ($value) {
-            my $ref = { Content => $value };
-            my ($ok, $msg) = $CF->_CanonicalizeValue( $ref );
-            unless ($ok) {
-                $m->notes( ( 'InvalidField-' . $CF->Id ) => $msg );
-                push @res, $label . ': ' . $msg;
-                $valid = 0;
-            }
+        my $label = $Labels{$CF->Name} || $CF->Name;
+        my $invalid_key = 'InvalidField-' . $CF->Id . ( $grouping ? "-$grouping" : '' );
+        if ( $invalid ) {
+            $m->notes( $invalid_key => $invalid_message );
+            push @res, $label . ': ' . $invalid_message;
+            $valid = 0;
+            next;
         }
 
-        if (!$CF->MatchPattern($value)) {
-            my $msg = $CF->FriendlyPattern;
-            $m->notes( ('InvalidField-' . $CF->Id) => $msg );
-            push @res, $label . ': ' . $msg;
-            $valid = 0;
+        my @values = _NormalizeObjectCustomFieldValue(
+            CustomField => $CF,
+            Value       => ($submitted->{Values} // $submitted->{Value} // $submitted->{Upload}),
+        );
+        if ($CF->Type =~ /^Date(?:Time)?$/) {
+            @values = grep {
+                my $DateObj = RT::Date->new ( $session{'CurrentUser'} );
+                $DateObj->Set(
+                    Format => 'unknown',
+                    Value => $_,
+                    ($CF->Type eq "Date" ? (Timezone => 'utc') : ())
+                );
+                $DateObj->IsSet
+            } @values;
         }
+        push @values, '' unless @values;
 
-        if ($CF->UniqueValues) {
-            my $existing = RT::ObjectCustomFieldValues->new(RT->SystemUser);
-            $existing->LimitToCustomField($CF->Id);
-            $existing->LimitToEnabled;
-            $existing->Limit(FIELD => 'ObjectType', VALUE => ref($Object));
-            $existing->Limit(FIELD => 'ObjectId', VALUE => $Object->id || 0, OPERATOR => '!=');
-            $existing->Limit(
-                FIELD => 'Content',
-                VALUE => $value,
-            );
+        for my $value( @values ) {
+            if ($value) {
+                my $ref = { Content => $value };
+                my ($ok, $msg) = $CF->_CanonicalizeValue( $ref );
+                unless ($ok) {
+                    $m->notes( $invalid_key => $msg );
+                    push @res, $label . ': ' . $msg;
+                    $valid = 0;
+                }
+            }
 
-            while (my $ocfv = $existing->Next) {
-                my $msg = loc("'[_1]' is not a unique value", $value);
-                $m->notes( ('InvalidField-' . $CF->Id) => $msg );
+            if (!$CF->MatchPattern($value)) {
+                my $msg = $CF->FriendlyPattern;
+                $m->notes( $invalid_key => $msg );
                 push @res, $label . ': ' . $msg;
                 $valid = 0;
-                last;
+            }
+
+            if ($CF->UniqueValues) {
+                my $existing = RT::ObjectCustomFieldValues->new(RT->SystemUser);
+                $existing->LimitToCustomField($CF->Id);
+                $existing->LimitToEnabled;
+                $existing->Limit(FIELD => 'ObjectType', VALUE => ref($Object));
+                $existing->Limit(FIELD => 'ObjectId', VALUE => $Object->id || 0, OPERATOR => '!=');
+                $existing->Limit(
+                    FIELD => 'Content',
+                    VALUE => $value,
+                );
+
+                while (my $ocfv = $existing->Next) {
+                    my $msg = loc("'[_1]' is not a unique value", $value);
+                    $m->notes( $invalid_key => $msg );
+                    push @res, $label . ': ' . $msg;
+                    $valid = 0;
+                    last;
+                }
             }
         }
     }
 }
 $m->notes('ValidFields', $valid);
-return wantarray? ($valid, @res): $valid;
+return wantarray ? ( $valid, List::MoreUtils::uniq(@res) ) : $valid;
 </%INIT>
 <%ARGS>
 $Object => RT::Ticket->new( $session{'CurrentUser'})
diff --git a/share/html/Helpers/AssetUpdate b/share/html/Helpers/AssetUpdate
index 9f79e75c4b2..07c5feab622 100644
--- a/share/html/Helpers/AssetUpdate
+++ b/share/html/Helpers/AssetUpdate
@@ -73,52 +73,67 @@ $m->callback(
     Events       => \@events,
 );
 
-my @people_changes = ProcessAssetRoleMembers( $asset => %ARGS );
-my @links_changes  = ProcessRecordLinks( RecordObj => $asset, ARGSRef => \%ARGS );
-my @cfs_changes    = ProcessObjectCustomFieldUpdates( Object => $asset, ARGSRef => \%ARGS );
-
-push @events, 'assetPeopleChanged'       if @people_changes;
-push @events, 'assetLinksChanged'        if @links_changes;
-push @events, 'assetCustomFieldsChanged' if @cfs_changes;
-
-push @results, @people_changes, @links_changes, @cfs_changes;
-push @results,
-    UpdateRecordObject(
-        Object        => $asset,
-        AttributesRef => [ $asset->WritableAttributes ],
-        ARGSRef       => \%ARGS
-    );
-
-$m->callback(
-    CallbackName => 'AfterProcessArguments',
-    Asset        => $asset,
-    ARGSRef      => \%ARGS,
-    Actions      => \@results,
-    Events       => \@events,
+my $checks_failure;
+my ( $status, @msg ) = $m->comp(
+    '/Elements/ValidateCustomFields',
+    CustomFields => $asset->CustomFields,
+    Object => $asset,
+    ARGSRef => \%ARGS,
 );
 
-for my $txn ( @{ $asset->{_TransactionBatch} || [] } ) {
-    if ( $txn->Type eq 'Set' ) {
-        push @events, 'asset' . $txn->Field . 'Changed';
-        if ( $txn->Field eq 'Catalog' ) {
-            push @events, 'mainContainerChanged';
+unless ( $status ) {
+    push @results, @msg;
+    $checks_failure = 1;
+}
+
+if ( !$checks_failure ) {
+    my @people_changes = ProcessAssetRoleMembers( $asset => %ARGS );
+    my @links_changes  = ProcessRecordLinks( RecordObj => $asset, ARGSRef => \%ARGS );
+    my @cfs_changes    = ProcessObjectCustomFieldUpdates( Object => $asset, ARGSRef => \%ARGS );
+
+    push @events, 'assetPeopleChanged'       if @people_changes;
+    push @events, 'assetLinksChanged'        if @links_changes;
+    push @events, 'assetCustomFieldsChanged' if @cfs_changes;
+
+    push @results, @people_changes, @links_changes, @cfs_changes;
+    push @results,
+        UpdateRecordObject(
+            Object        => $asset,
+            AttributesRef => [ $asset->WritableAttributes ],
+            ARGSRef       => \%ARGS
+        );
+
+    $m->callback(
+        CallbackName => 'AfterProcessArguments',
+        Asset        => $asset,
+        ARGSRef      => \%ARGS,
+        Actions      => \@results,
+        Events       => \@events,
+    );
+
+    for my $txn ( @{ $asset->{_TransactionBatch} || [] } ) {
+        if ( $txn->Type eq 'Set' ) {
+            push @events, 'asset' . $txn->Field . 'Changed';
+            if ( $txn->Field eq 'Catalog' ) {
+                push @events, 'mainContainerChanged';
+            }
+            elsif ( $txn->Field =~ /^(Name|Status|Description)$/ ) {
+                push @events, 'assetBasicsChanged';
+            }
         }
-        elsif ( $txn->Field =~ /^(Name|Status|Description)$/ ) {
-            push @events, 'assetBasicsChanged';
+        elsif ( $txn->Type eq 'Status' ) {
+            push @events, 'assetStatusChanged', 'assetBasicsChanged';
+        }
+        elsif ( $txn->Type eq 'CustomField' ) {
+            push @events, 'customField-' . $txn->Field . 'Changed';
         }
     }
-    elsif ( $txn->Type eq 'Status' ) {
-        push @events, 'assetStatusChanged', 'assetBasicsChanged';
-    }
-    elsif ( $txn->Type eq 'CustomField' ) {
-        push @events, 'customField-' . $txn->Field . 'Changed';
-    }
-}
 
-if ( ( RT::Interface::Web::RequestENV('HTTP_HX_CURRENT_URL') // '' ) =~ m{/Asset/Display.html}
-    && $old_layout ne GetPageLayout( Object => $asset, Page => 'Display' ) )
-{
-    push @events, 'mainContainerChanged';
+    if ( ( RT::Interface::Web::RequestENV('HTTP_HX_CURRENT_URL') // '' ) =~ m{/Asset/Display.html}
+        && $old_layout ne GetPageLayout( Object => $asset, Page => 'Display' ) )
+    {
+        push @events, 'mainContainerChanged';
+    }
 }
 
 my %page_menu_events = ( 'assetStatusChanged' => 1 );
@@ -126,9 +141,14 @@ push @events, 'pageMenuChanged' if grep { $page_menu_events{$_} } @events;
 
 $r->headers_out->{'HX-Trigger'} = JSON(
     {
-        actionsChanged => \@results,
+        actionsChanged => { messages => \@results, isWarning => $checks_failure },
+        $checks_failure
+        ? ( validationFailed => [ GetInvalidFields( Object => $asset ) ] )
+        : ( requestSucceeded => 1 ),
         map { $_ => '' } @events
     },
     ascii => 1,
-) if @events || @results;
+);
+
+Abort( loc("Validation error"), Code => HTTP::Status::HTTP_UNPROCESSABLE_CONTENT ) if $checks_failure;
 </%INIT>
diff --git a/share/html/Helpers/TicketUpdate b/share/html/Helpers/TicketUpdate
index 6c419d103f4..2d92072b8eb 100644
--- a/share/html/Helpers/TicketUpdate
+++ b/share/html/Helpers/TicketUpdate
@@ -178,14 +178,20 @@ $m->callback(
     ARGSRef      => \%ARGS,
     Actions      => \@Actions,
     Events       => \@events,
+    ChecksFailed => \$checks_failure,
 );
 
 $r->headers_out->{'HX-Trigger'} = JSON(
     {
-        actionsChanged => \@Actions,
+        actionsChanged => { messages => \@Actions, isWarning => $checks_failure },
+        $checks_failure
+        ? ( validationFailed => [ GetInvalidFields( Object => $TicketObj ) ] )
+        : ( requestSucceeded => 1 ),
         map { $_ => '' } @events
     },
     ascii => 1,
-) if @events || @Actions;
+);
+
+Abort( loc("Validation error"), Code => HTTP::Status::HTTP_UNPROCESSABLE_CONTENT ) if $checks_failure;
 
 </%INIT>
diff --git a/share/html/Ticket/Create.html b/share/html/Ticket/Create.html
index 33057cdc165..abaa4eac357 100644
--- a/share/html/Ticket/Create.html
+++ b/share/html/Ticket/Create.html
@@ -224,6 +224,17 @@
 
 {
     my ($status, @msg) = $m->comp(
+        '/Elements/ValidateCustomFields',
+        CustomFields => $QueueObj->TicketTransactionCustomFields,
+        Object => RT::Transaction->new( $session{'CurrentUser'} ),
+        ARGSRef => \%ARGS
+    );
+    unless ( $status ) {
+        $checks_failure = 1;
+        push @results, @msg;
+    }
+
+    ($status, @msg) = $m->comp(
         '/Elements/ValidateCustomFields',
         CustomFields    => $QueueObj->TicketCustomFields,
         ARGSRef         => \%ARGS
@@ -314,6 +325,17 @@
 $m->comp( '/Articles/Elements/CheckSkipCreate', ARGSRef => \%ARGS, skip_create => \$skip_create,
               checks_failure => $checks_failure, results => \@results );
 
+if ( $checks_failure && $ARGS{SubmitTicket} && RT::Interface::Web::RequestENV('HTTP_HX_BOOSTED') ) {
+    $r->headers_out->{'HX-Trigger'} = JSON(
+        {
+            actionsChanged => { messages => \@results, isWarning => 1 },
+            validationFailed => [ GetInvalidFields( Object => RT::Ticket->new( $session{CurrentUser} ) ) ],
+        },
+        ascii => 1,
+    );
+    Abort( loc("Validation error"), Code => HTTP::Status::HTTP_UNPROCESSABLE_CONTENT );
+}
+
 if ( !$checks_failure && !$skip_create && $ARGS{SubmitTicket} ) {
     $m->comp('Display.html', %ARGS);
     $RT::Logger->crit("After display call; error is $@");
diff --git a/share/html/Ticket/Elements/EditTransactionCustomFields b/share/html/Ticket/Elements/EditTransactionCustomFields
index b0bfbb6c760..bd373f1b03f 100644
--- a/share/html/Ticket/Elements/EditTransactionCustomFields
+++ b/share/html/Ticket/Elements/EditTransactionCustomFields
@@ -57,11 +57,8 @@
     %ARGS,
     CustomField => $CF,
     Object => RT::Transaction->new( $session{'CurrentUser'} ),
+    ShowHints => $ShowHints,
 &>
-%  if (my $msg = $m->notes('InvalidField-' . $CF->Id)) {
-        <br />
-        <span class="cfinvalidfield"><% $msg %></span>
-%  }
 
 % }
 % }
@@ -88,5 +85,6 @@ $QueueObj => undef
 $InTable => 0
 $LabelCols => 3
 $ValueCols => 9
+$ShowHints => 1
 </%ARGS>
 
diff --git a/share/html/Ticket/Update.html b/share/html/Ticket/Update.html
index fd067c17eca..efff8fe8045 100644
--- a/share/html/Ticket/Update.html
+++ b/share/html/Ticket/Update.html
@@ -214,6 +214,17 @@
 $m->callback( CallbackName => 'BeforeUpdate', ARGSRef => \%ARGS, skip_update => \$skip_update,
               checks_failure => $checks_failure, results => \@results, TicketObj => $TicketObj );
 
+if ( $checks_failure && $ARGS{SubmitTicket} && RT::Interface::Web::RequestENV('HTTP_HX_BOOSTED') ) {
+    $r->headers_out->{'HX-Trigger'} = JSON(
+        {
+            actionsChanged   => { messages => \@results, isWarning => 1 },
+            validationFailed => [ GetInvalidFields( Object => $TicketObj ) ],
+        },
+        ascii => 1,
+    );
+    Abort( loc("Validation error"), Code => HTTP::Status::HTTP_UNPROCESSABLE_CONTENT );
+}
+
 if ( !$checks_failure && !$skip_update && exists $ARGS{SubmitTicket} ) {
     $m->callback( Ticket => $TicketObj, ARGSRef => \%ARGS, CallbackName => 'BeforeDisplay' );
     return $m->comp('Display.html', TicketObj => $TicketObj, %ARGS);
diff --git a/share/static/css/elevator/forms.css b/share/static/css/elevator/forms.css
index e00054de8ae..60647a822d0 100644
--- a/share/static/css/elevator/forms.css
+++ b/share/static/css/elevator/forms.css
@@ -523,14 +523,6 @@ div.row>div.label>span.prev-icon-helper+.icon-helper {
         background-color: #fcc;
     }
 
-    .cfinvalidfield {
-        color: red;
-    }
-
-    .cfhints {
-        color: #3858a3;
-    }
-
     .invalid {
         color: red;
     }
@@ -755,10 +747,14 @@ div.row>div.label>span.prev-icon-helper+.icon-helper {
     }
 
     .form-control {
-        background: #323D42 !important;
+        background-color: #323D42;
         border-color: #717171;
     }
 
+    .form-control.is-invalid {
+        border-color: var(--bs-form-invalid-border-color);
+    }
+
     .selectionbox-js .contents li,
     .selectionbox-js .contents .placeholder {
         background-color: #323D42 !important;
diff --git a/share/static/js/util.js b/share/static/js/util.js
index 67eb88536e3..671416e57ac 100644
--- a/share/static/js/util.js
+++ b/share/static/js/util.js
@@ -748,6 +748,7 @@ jQuery(function() {
                elt.remove();
             });
             document.getElementById('hx-boost-spinner').classList.remove('d-none');
+            jQuery.jGrowl('close');
 
             // Highlight active top menu
             if ( evt.detail.elt.tagName === 'A' ) {
@@ -795,6 +796,9 @@ jQuery(function() {
     document.body.addEventListener('htmx:beforeSwap', function(evt) {
         const status = evt.detail.xhr.status.toString();
         if (status.match(/^[45]/)) {
+            // 422 means rt validation error and is handled in other places.
+            if ( status === '422' ) return;
+
             if (evt.target && evt.detail.requestConfig.verb === "get") {
                 evt.detail.shouldSwap = true;
             }
@@ -816,38 +820,73 @@ jQuery(function() {
     });
 
     document.body.addEventListener('actionsChanged', function(evt) {
-        if ( evt.detail.value ) {
-            for ( const action of evt.detail.value ) {
-                jQuery.jGrowl(action, { themeState: 'none' });
-            }
-
-            const history_container = document.querySelector('.history-container');
-            if ( history_container ) {
-                if ( history_container.getAttribute('data-oldest-transactions-first') == 1 ) {
-                    history_container.removeAttribute('data-disable-scroll-loading');
+        jQuery.jGrowl('close');
+        evt.detail.messages ||= evt.detail.value; // .value contains messages if it's passed as "actionsChanged => [$msg]"
+        if ( evt.detail.messages ) {
+            for ( const message of evt.detail.messages ) {
+                if ( evt.detail.isWarning ) {
+                    alertWarning(message);
                 }
                 else {
-                    const url = history_container.getAttribute('data-url');
-                    if ( url ) {
-                        let queryString = '&mode=prepend&loadAll=1';
-                        let lastTransaction = history_container.querySelector('.transaction');
-                        if ( lastTransaction ) {
-                            queryString += '&lastTransactionId=' + lastTransaction.dataset.transactionId;
-                        }
+                    jQuery.jGrowl(message, { themeState: 'none' });
+                }
+            }
+        }
+    });
 
-                        jQuery.ajax({
-                            url: url + queryString,
-                            success: function(html) {
-                                const transactions = jQuery(html).filter('div.transaction');
-                                if( html && transactions.length ) {
-                                    jQuery(".history-container").prepend(html);
-                                }
-                            },
-                            error: function(xhr, reason) {
-                                jQuery.jGrowl(reason, { sticky: true, themeState: 'none' });
-                            }
-                        });
+    document.body.addEventListener('requestSucceeded', function(evt) {
+        if ( evt.detail.elt.classList.contains('inline-edit') ) {
+            toggleInlineEdit(jQuery(evt.detail.elt.closest('.titlebox')).find('.inline-edit-toggle:visible'));
+        }
+
+        const history_container = document.querySelector('.history-container');
+        if ( history_container ) {
+            if ( history_container.getAttribute('data-oldest-transactions-first') == 1 ) {
+                history_container.removeAttribute('data-disable-scroll-loading');
+            }
+            else {
+                const url = history_container.getAttribute('data-url');
+                if ( url ) {
+                    let queryString = '&mode=prepend&loadAll=1';
+                    let lastTransaction = history_container.querySelector('.transaction');
+                    if ( lastTransaction ) {
+                        queryString += '&lastTransactionId=' + lastTransaction.dataset.transactionId;
                     }
+
+                    jQuery.ajax({
+                        url: url + queryString,
+                        success: function(html) {
+                            const transactions = jQuery(html).filter('div.transaction');
+                            if( html && transactions.length ) {
+                                jQuery(".history-container").prepend(html);
+                            }
+                        },
+                        error: function(xhr, reason) {
+                            jQuery.jGrowl(reason, { sticky: true, themeState: 'none' });
+                        }
+                    });
+                }
+            }
+        }
+    });
+
+    document.body.addEventListener('validationFailed', function(evt) {
+        // Make hint text red if we found any errors on inline edit
+        if ( evt.detail.value ) {
+            evt.detail.elt.querySelectorAll('.is-invalid').forEach(elt => {
+                elt.classList.remove('is-invalid');
+                let hintSpan = document.getElementById(elt.getAttribute("aria-describedby"));
+                if ( hintSpan ) {
+                    hintSpan.classList.remove('invalid-feedback');
+                }
+            });
+
+            for ( let field of evt.detail.value ) {
+                let cfInputField = document.getElementById(field);
+                cfInputField.classList.add('is-invalid');
+                let hintSpan = document.getElementById(cfInputField.getAttribute("aria-describedby"));
+                if ( hintSpan ) {
+                    hintSpan.classList.add('invalid-feedback');
                 }
             }
         }
@@ -1672,6 +1711,13 @@ function loadOwnerDropdownDelay(owner_dropdown_delay) {
     }
 }
 
+function toggleInlineEdit(link) {
+    if (!link) return;
+    link.siblings('.inline-edit-toggle').removeClass('hidden');
+    link.addClass('hidden');
+    link.closest('.titlebox').toggleClass('editing');
+}
+
 htmx.onLoad(function(elt) {
 
     /* inline edit on ticket display */
@@ -1700,15 +1746,9 @@ htmx.onLoad(function(elt) {
         }
     });
 
-    var toggle_inline_edit = function (link) {
-        link.siblings('.inline-edit-toggle').removeClass('hidden');
-        link.addClass('hidden');
-        link.closest('.titlebox').toggleClass('editing');
-    }
-
     jQuery(elt).find('.inline-edit-toggle').click(function (e) {
         e.preventDefault();
-        toggle_inline_edit(jQuery(this));
+        toggleInlineEdit(jQuery(this));
     });
 
     jQuery(elt).find('.titlebox[data-inline-edit-behavior="click"] > .titlebox-content').click(function (e) {
@@ -1726,11 +1766,7 @@ htmx.onLoad(function(elt) {
         if (container.hasClass('editing')) {
             return;
         }
-        toggle_inline_edit(container.find('.inline-edit-toggle:visible'));
-    });
-
-    jQuery(elt).find('form.inline-edit').submit(function (e) {
-        toggle_inline_edit(jQuery(this).closest('.titlebox').find('.inline-edit-toggle:visible'));
+        toggleInlineEdit(container.find('.inline-edit-toggle:visible'));
     });
 
     // Register triggers for cf changes
@@ -2101,7 +2137,14 @@ function clipContent(elt) {
 
 function alertError(message) {
     jQuery.jGrowl(`
-<div id="rt-content-fetch-errors-network" class="p-3 text-danger-emphasis bg-danger-subtle border border-danger-subtle rounded-3">
-  <span class="danger-text-emphasis">${message}</span>
+<div class="p-3 text-danger-emphasis bg-danger-subtle border border-danger-subtle rounded-3">
+  <span>${message}</span>
+</div>`, { sticky: true, themeState: 'none' });
+}
+
+function alertWarning(message) {
+    jQuery.jGrowl(`
+<div class="p-3 text-warning-emphasis bg-warning-subtle border border-warning-subtle rounded-3">
+  <span>${message}</span>
 </div>`, { sticky: true, themeState: 'none' });
 }
diff --git a/t/assets/web.t b/t/assets/web.t
index 3b3aca6b118..19d6603e2f2 100644
--- a/t/assets/web.t
+++ b/t/assets/web.t
@@ -23,9 +23,9 @@ my $material = create_cf( Name => 'Material' );
 ok $material->id, "Created CF";
 
 my %CF = (
-    Height      => ".CF-" . $height->id    . "-Edit form-control",
-    Material    => ".CF-" . $material->id  . "-Edit form-control",
-    Purchased   => ".CF-" . $purchased->id . "-Edit form-control",
+    Height      => ".CF-" . $height->id    . "-Edit form-control ",
+    Material    => ".CF-" . $material->id  . "-Edit form-control ",
+    Purchased   => ".CF-" . $purchased->id . "-Edit form-control ",
 );
 
 my ($base, $m) = RT::Test::Assets->started_ok;
@@ -57,11 +57,11 @@ diag "Create with CFs";
     ok apply_cfs($height, $material), "Applied CFs";
 
     $m->follow_link_ok({ id => "assets-create" }, "Asset create link");
-    $m->submit_form_ok({ with_fields => { Catalog => $catalog->id } }, "Picked a catalog");
 
     ok $m->form_with_fields(qw(id Name Description)), "Found form";
     $m->submit_form_ok({
         fields => {
+            Catalog         => $catalog->id,
             id              => 'new',
             Name            => 'Standing desk',
             $CF{Height}     => 'forty-six inches',
@@ -74,7 +74,7 @@ diag "Create with CFs";
     # Intentionally fix only the invalid CF to test the other fields are
     # preserved across errors
     ok $m->form_with_fields(qw(id Name Description)), "Found form again";
-    $m->set_fields( $CF{Height} => '46"' );
+    $m->set_fields( $CF{Height} . 'is-invalid' => '46"' );
     $m->submit_form_ok({}, "resubmitted form");
 
     $m->content_like(qr/Asset .* created/, "Found created message");
@@ -92,17 +92,16 @@ diag "Create with CFs in other groups";
     ok apply_cfs($purchased), "Applied CF";
 
     $m->follow_link_ok({ id => "assets-create" }, "Asset create link");
-    $m->submit_form_ok({ with_fields => { Catalog => $catalog->id } }, "Picked a catalog");
-
     ok $m->form_with_fields(qw(id Name Description)), "Found form";
 
     $m->submit_form_ok({
         fields => {
+            Catalog     => $catalog->id ,
             id          => 'new',
             Name        => 'Chair',
             $CF{Height} => '23',
         },
-    }, "submited create form");
+    }, "submitted create form");
 
     $m->content_like(qr/Asset .* created/, "Found created message");
     $m->content_unlike(qr/Purchased.*?must match .*?Year/, "Lacks validation error for Purchased");
diff --git a/t/web/ticket_time.t b/t/web/ticket_time.t
index 06b7cf29596..b23f94b3f73 100644
--- a/t/web/ticket_time.t
+++ b/t/web/ticket_time.t
@@ -129,19 +129,19 @@ for my $time ( @invalid ) {
         $args,
     );
 
-    is( $req->code, 200, 'Submitted invalid time values' );
-    my $results = JSON::from_json($req->content);
-
-#    for my $field ( qw/TimeWorked TimeEstimated TimeLeft/ ) {
-#        is( shift @{$results->{actions}}, "Invalid $field: it should be a number", "Caught invalid $field");
-#    }
-
-    cmp_deeply( [
-        "Invalid TimeWorked: it should be a number",
-        "Invalid TimeEstimated: it should be a number",
-        "Invalid TimeLeft: it should be a number" ],
-        set(@{$results->{actions}}), "Caught invalid values" );
-
+    is( $req->code, 422, 'Submitted invalid time values' );
+    $m->next_warning_like(qr/Validation error/);
+
+    my $results = JSON::from_json( $req->header('HX-Trigger') );
+    cmp_deeply(
+        [
+            "Invalid TimeWorked: it should be a number",
+            "Invalid TimeEstimated: it should be a number",
+            "Invalid TimeLeft: it should be a number"
+        ],
+        set( @{ $results->{actionsChanged}{messages} } ),
+        "Caught invalid values"
+    );
 }
 
 =pod