diff --git a/lib/mv_web/member_live/form_component.ex b/lib/mv_web/member_live/form_component.ex
index 9db46b0..101cf6c 100644
--- a/lib/mv_web/member_live/form_component.ex
+++ b/lib/mv_web/member_live/form_component.ex
@@ -39,7 +39,13 @@ defmodule MvWeb.MemberLive.FormComponent do
         <.inputs_for :let={f_property} field={@form[:properties]}>
           <% type = Enum.find(@property_types, &(&1.id == f_property[:property_type_id].value)) %>
           <.inputs_for :let={value_form} field={f_property[:value]}>
-            <.input field={value_form[:value]} label={type && type.name} />
+            <% input_type =
+              cond do
+                type && type.value_type == :boolean -> "checkbox"
+                type && type.value_type == :date -> :date
+                true -> :text
+              end %>
+            <.input field={value_form[:value]} label={type && type.name} type={input_type} />
           </.inputs_for>
           <input
             type="hidden"