diff --git a/Smartway.UiComponent/Inputs/FormEntry.xaml b/Smartway.UiComponent/Inputs/FormEntry.xaml
index 287167e..9c4c818 100644
--- a/Smartway.UiComponent/Inputs/FormEntry.xaml
+++ b/Smartway.UiComponent/Inputs/FormEntry.xaml
@@ -70,7 +70,7 @@
                         Focused="InputOnFocused"
                         IsPassword="{Binding Source={x:Reference Self}, Path=IsPassword}"
                         Unfocused="InputOnUnfocused"
-                        >
+                        AutomationId="{Binding Source={x:Reference Self}, Path=AutomationId, StringFormat='{0}_Input'}">
                         <Entry.Triggers>
                             <DataTrigger TargetType="Entry" Binding="{Binding Source={x:Reference Self}, Path=ReadOnly}" Value="True">
                                 <Setter Property="IsReadOnly" Value="True"/>
diff --git a/Smartway.UiComponent/Inputs/NumericDateEntry.xaml b/Smartway.UiComponent/Inputs/NumericDateEntry.xaml
index 370c525..01e677d 100644
--- a/Smartway.UiComponent/Inputs/NumericDateEntry.xaml
+++ b/Smartway.UiComponent/Inputs/NumericDateEntry.xaml
@@ -24,9 +24,9 @@
             </Style>
         </ResourceDictionary>
     </StackLayout.Resources>
-    <Entry x:Name="FirstEntry" Grid.Column="0" Focused="OnFocusedSelectAllEntryContent"/>
+    <Entry x:Name="FirstEntry" Grid.Column="0" Focused="OnFocusedSelectAllEntryContent" AutomationId="{Binding Source={x:Reference Self}, Path=AutomationId, StringFormat='{0}_Day'}"/>
     <Label Grid.Column="1" Text="/"/>
-    <Entry x:Name="SecondEntry" Grid.Column="2" Focused="OnFocusedSelectAllEntryContent"/>
+    <Entry x:Name="SecondEntry" Grid.Column="2" Focused="OnFocusedSelectAllEntryContent" AutomationId="{Binding Source={x:Reference Self}, Path=AutomationId, StringFormat='{0}_Month'}"/>
     <Label Grid.Column="3" Text="/"/>
-    <Entry x:Name="ThirdEntry" Grid.Column="4" Focused="OnFocusedSelectAllEntryContent"/>
+    <Entry x:Name="ThirdEntry" Grid.Column="4" Focused="OnFocusedSelectAllEntryContent" AutomationId="{Binding Source={x:Reference Self}, Path=AutomationId, StringFormat='{0}_Year'}"/>
 </StackLayout>
\ No newline at end of file