diff --git a/src/oruga-config.ts b/src/oruga-config.ts
index 98627d78a..7d97f7722 100644
--- a/src/oruga-config.ts
+++ b/src/oruga-config.ts
@@ -4,25 +4,36 @@ export const orugaConfig = {
   statusIcon: true,
   button: {
     rootClass: "btn",
-    variantClass: "btn-",
+    variantClass: (variant: string) => {
+      return `btn-${variant}`;
+    },
     roundedClass: "btn-rounded",
-    outlinedClass: "btn-outlined-",
+    outlinedClass: (variant: string) => {
+      return `btn-outlined-${variant}`;
+    },
     disabledClass: "btn-disabled",
-    sizeClass: "btn-size-",
+    sizeClass: (size: string) => {
+      return `"btn-size-${size}`;
+    },
   },
   field: {
     rootClass: "field",
     labelClass: "field-label",
     messageClass: "text-sm italic",
-    variantClass: "field-",
-    variantMessageClass: "field-message-",
+    variantMessageClass: (variant: string) => {
+      return `field-message-${variant}`;
+    },
   },
   input: {
     inputClass: "input",
     roundedClass: "rounded",
-    variantClass: "input-",
+    variantClass: (variant: string) => {
+      return `input-${variant}`;
+    },
     iconRightClass: "input-icon-right",
-    sizeClass: "input-size-",
+    sizeClass: (size: string) => {
+      return `input-size-${size}`;
+    },
   },
   taginput: {
     itemClass: "taginput-item",
@@ -44,7 +55,9 @@ export const orugaConfig = {
     itemGroupTitleClass: "autocomplete-item-group-title",
   },
   icon: {
-    variantClass: "icon-",
+    variantClass: (variant: string) => {
+      return `icon-${variant}`;
+    },
   },
   checkbox: {
     rootClass: "checkbox",
@@ -88,7 +101,9 @@ export const orugaConfig = {
   },
   notification: {
     rootClass: "notification",
-    variantClass: "notification-",
+    variantClass: (variant: string) => {
+      return `notification-${variant}`;
+    },
   },
   table: {
     tableClass: "table",
@@ -111,16 +126,24 @@ export const orugaConfig = {
   tabs: {
     rootClass: "tabs",
     navTabsClass: "tabs-nav",
-    navTypeClass: "tabs-nav-",
-    navSizeClass: "tabs-nav-",
+    navTypeClass: (type: string) => {
+      return `tabs-nav-${type}`;
+    },
+    navSizeClass: (size: string) => {
+      return `tabs-nav-${size}`;
+    },
     itemWrapperClass: "tabs-nav-item-wrapper",
-    itemHeaderTypeClass: "tabs-nav-item-",
-    itemHeaderActiveClass: "tabs-nav-item-active-",
+    itemHeaderTypeClass: (type: string) => {
+      return `tabs-nav-item-${type}`;
+    },
+    itemHeaderActiveClass: "tabs-nav-item-active",
   },
   tooltip: {
     rootClass: "tooltip",
     contentClass: "tooltip-content",
     arrowClass: "tooltip-arrow",
-    variantClass: "tooltip-content-",
+    variantClass: (variant: string) => {
+      return `tooltip-content-${variant}`;
+    },
   },
 };
diff --git a/src/views/Account/RegisterView.vue b/src/views/Account/RegisterView.vue
index ab2eba3d9..5741068d0 100644
--- a/src/views/Account/RegisterView.vue
+++ b/src/views/Account/RegisterView.vue
@@ -24,13 +24,14 @@
           required
           v-model="identity.name"
           id="identityName"
-          @input="(event: any) => updateUsername(event.target.value)"
+          expanded
+          @update:modelValue="(value: string) => updateUsername(value)"
         />
       </o-field>
 
       <o-field
         :label="t('Username')"
-        :variant="errors.preferred_username ? 'danger' : null"
+        :variant="errors.preferred_username ? 'danger' : 'primary'"
         :message="errors.preferred_username"
         labelFor="identityPreferredUsername"
       >
@@ -47,6 +48,7 @@
             expanded
             id="identityPreferredUsername"
             v-model="identity.preferredUsername"
+            :variant="errors.preferred_username ? 'danger' : ''"
             :validation-message="
               identity.preferredUsername
                 ? t(
@@ -75,6 +77,7 @@
           rows="2"
           id="identitySummary"
           v-model="identity.summary"
+          expanded
         />
       </o-field>