diff --git a/apps/scandic-web/components/HotelReservation/EnterDetails/Details/RoomOne/index.tsx b/apps/scandic-web/components/HotelReservation/EnterDetails/Details/RoomOne/index.tsx
index d89c8e547..0aaba54b0 100644
--- a/apps/scandic-web/components/HotelReservation/EnterDetails/Details/RoomOne/index.tsx
+++ b/apps/scandic-web/components/HotelReservation/EnterDetails/Details/RoomOne/index.tsx
@@ -155,7 +155,7 @@ export default function Details({ user }: DetailsProps) {
})}
maxLength={30}
name="firstName"
- readOnly={!!user}
+ disabled={!!user}
registerOptions={{ required: true, onBlur: updateDetailsStore }}
/>
{user ? null : (
diff --git a/apps/scandic-web/components/TempDesignSystem/Form/Input/index.tsx b/apps/scandic-web/components/TempDesignSystem/Form/Input/index.tsx
index e4a7d97a1..20fea8c04 100644
--- a/apps/scandic-web/components/TempDesignSystem/Form/Input/index.tsx
+++ b/apps/scandic-web/components/TempDesignSystem/Form/Input/index.tsx
@@ -72,6 +72,7 @@ const Input = forwardRef(function Input(
maxLength={maxLength}
placeholder={placeholder}
readOnly={readOnly}
+ disabled={disabled}
required={!!registerOptions.required}
type={type}
inputMode={inputMode}
diff --git a/packages/design-system/lib/components/Form/Country/CountryCombobox.tsx b/packages/design-system/lib/components/Form/Country/CountryCombobox.tsx
index 28bd584c2..5a73abd0a 100644
--- a/packages/design-system/lib/components/Form/Country/CountryCombobox.tsx
+++ b/packages/design-system/lib/components/Form/Country/CountryCombobox.tsx
@@ -32,7 +32,7 @@ export default function CountryCombobox({
lang = 'en',
countries,
name = 'country',
- readOnly = false,
+ disabled = false,
registerOptions = {},
}: CountryProps) {
const { startsWith } = useFilter({ sensitivity: 'base' })
@@ -84,7 +84,7 @@ export default function CountryCombobox({
aria-label={label}
className={styles.select}
data-testid={name}
- isReadOnly={readOnly}
+ isDisabled={disabled}
isRequired={Boolean(registerOptions?.required)}
isInvalid={fieldState.invalid}
name={name}
diff --git a/packages/design-system/lib/components/Form/Country/CountrySelect.tsx b/packages/design-system/lib/components/Form/Country/CountrySelect.tsx
index 50a533531..e29868702 100644
--- a/packages/design-system/lib/components/Form/Country/CountrySelect.tsx
+++ b/packages/design-system/lib/components/Form/Country/CountrySelect.tsx
@@ -18,7 +18,7 @@ export default function CountrySelect({
countries,
lang = 'en',
name = 'country',
- readOnly = false,
+ disabled = false,
registerOptions = {},
}: CountryProps) {
const { field, formState, fieldState } = useController({
@@ -53,7 +53,7 @@ export default function CountrySelect({