diff --git a/admin/app/components/solidus_admin/products/show/component.html.erb b/admin/app/components/solidus_admin/products/show/component.html.erb
index 452502c8df2..3289bd88df3 100644
--- a/admin/app/components/solidus_admin/products/show/component.html.erb
+++ b/admin/app/components/solidus_admin/products/show/component.html.erb
@@ -100,9 +100,20 @@
 
       <%= page_with_sidebar_aside do %>
         <%= render component('ui/panel').new(title: "Publishing") do %>
-          <%= render component("ui/forms/field").text_field(f, :available_on, hint: t(".available_on_html"), type: :date) %>
-          <%= render component("ui/forms/field").text_field(f, :discontinue_on, hint: t(".discontinue_on_html"), type: :date) %>
-
+          <%= render component("ui/forms/field").text_field(
+            f,
+            :available_on,
+            hint: t(".available_on_html"),
+            type: :date,
+            value: f.object.available_on&.to_date
+          ) %>
+          <%= render component("ui/forms/field").text_field(
+            f,
+            :discontinue_on,
+            hint: t(".discontinue_on_html"),
+            type: :date,
+            value: f.object.discontinue_on&.to_date
+          ) %>
           <label class="flex gap-2 items-center">
             <%= render component("ui/forms/checkbox").new(
               name: "#{f.object_name}[promotionable]",
diff --git a/admin/app/components/solidus_admin/products/status/component.rb b/admin/app/components/solidus_admin/products/status/component.rb
index 2c7be1885f6..bf10c63e343 100644
--- a/admin/app/components/solidus_admin/products/status/component.rb
+++ b/admin/app/components/solidus_admin/products/status/component.rb
@@ -5,6 +5,7 @@ class SolidusAdmin::Products::Status::Component < SolidusAdmin::BaseComponent
     available: :green,
     discontinued: :yellow,
     deleted: :red,
+    unavailable: :yellow
   }.freeze
 
   def self.from_product(product)
@@ -13,8 +14,10 @@ def self.from_product(product)
         :deleted
       elsif product.discontinued?
         :discontinued
-      else
+      elsif product.available?
         :available
+      else
+        :unavailable
       end
 
     new(status: status)
diff --git a/admin/app/components/solidus_admin/products/status/component.yml b/admin/app/components/solidus_admin/products/status/component.yml
index 51e56549a30..723c88d8ef3 100644
--- a/admin/app/components/solidus_admin/products/status/component.yml
+++ b/admin/app/components/solidus_admin/products/status/component.yml
@@ -2,3 +2,4 @@ en:
   available: 'Available'
   discontinued: 'Discontinued'
   deleted: 'Deleted'
+  unavailable: 'Unavailable'
diff --git a/admin/spec/components/solidus_admin/ui/forms/input/component_spec.rb b/admin/spec/components/solidus_admin/ui/forms/input/component_spec.rb
index cb00d6a65cb..3673b0906d1 100644
--- a/admin/spec/components/solidus_admin/ui/forms/input/component_spec.rb
+++ b/admin/spec/components/solidus_admin/ui/forms/input/component_spec.rb
@@ -34,5 +34,11 @@
 
       expect(page).to have_css("input[type='number'][name='name'][value='value']")
     end
+
+    it "renders a date input" do
+      render_inline(described_class.new(type: :date, name: "name", value: "2020-01-01"))
+
+      expect(page).to have_css("input[type='date'][name='name'][value='2020-01-01']")
+    end
   end
 end