diff --git a/BeWo/View/Detail/ServiceRecordEditView.xaml b/BeWo/View/Detail/ServiceRecordEditView.xaml
index 904caf4f9..5a1e9da45 100644
--- a/BeWo/View/Detail/ServiceRecordEditView.xaml
+++ b/BeWo/View/Detail/ServiceRecordEditView.xaml
@@ -146,8 +146,8 @@
 
 
                   <Label Content="Dauer (min)" Grid.Column="2" x:Name="MinStdDauerLabel" Grid.Row="2"/>
-                  <dxe:SpinEdit MinValue="0" Increment="5" IsFloatValue="False" AllowNullInput="False" x:Name="numerictb_duration"
-                                EditValue="{Binding Path=Duration, Mode=TwoWay, StringFormat=N2, UpdateSourceTrigger=PropertyChanged}"
+                  <dxe:SpinEdit MinValue="0" Increment="5" IsFloatValue="False" AllowNullInput="False" x:Name="numerictb_duration" Mask="########" MaskUseAsDisplayFormat="True"
+                                EditValue="{Binding Path=Duration, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                 Grid.Column="3" Grid.Row="2"
                                 Height="23" Margin="3,0,3,3"/>
 
@@ -155,7 +155,7 @@
 
                   <dxe:ComboBoxEdit ItemsSource="{x:Static core:EnumTranslations.ZeiterfassungsDauerTranslations}" Grid.Column="2" Grid.ColumnSpan="2" Grid.Row="2" Margin="3,0,3,3"
                                 EditValue="{Binding Path=DurationInStunden, UpdateSourceTrigger=PropertyChanged}" DisplayMember="Value" ValueMember="Key"
-                                IsTextEditable="False" x:Name="MinSTDOhneEnd" Visibility="Collapsed"/>
+                                IsTextEditable="False" x:Name="MinSTDOhneEnd" Visibility="Collapsed" SelectedIndexChanged="MinSTDOhneEnd_OnSelectedIndexChanged"/>
 
 
                 </Grid>
@@ -206,8 +206,8 @@
 														
                                                  
                   <Label Content="Dauer" Grid.Column="2" x:Name="MinStdDauerlbl" Grid.Row="2"/>
-                      <dxe:SpinEdit MinValue="0" Increment="5" IsFloatValue="False" AllowNullInput="False" x:Name="numeric_duration"
-                                    EditValue="{Binding Path=DurationSTD, Mode=TwoWay, StringFormat=N2, UpdateSourceTrigger=PropertyChanged}"
+                      <dxe:SpinEdit MinValue="0" Increment="5" IsFloatValue="False" AllowNullInput="False" x:Name="numeric_duration" Mask="########" MaskUseAsDisplayFormat="True"
+                                    EditValue="{Binding Path=DurationSTD, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                     Grid.Column="3" Grid.Row="2"
                                     Height="23" Margin="3,0,3,3"/>
 
@@ -215,7 +215,7 @@
                                                       
                   <dxe:ComboBoxEdit ItemsSource="{x:Static core:EnumTranslations.ZeiterfassungsDauerTranslations}" Grid.Column="2" Grid.ColumnSpan="2" Grid.Row="2" Margin="3,0,3,3"
                                 EditValue="{Binding Path=DurationInStunden, UpdateSourceTrigger=PropertyChanged}" DisplayMember="Value" ValueMember="Key"
-                                IsTextEditable="False" x:Name="MinSTDMitEnd" Visibility="Collapsed" />
+                                IsTextEditable="False" x:Name="MinSTDMitEnd" Visibility="Collapsed" SelectedIndexChanged="MinSTDMitEnd_OnSelectedIndexChanged" />
                                               
 														                        
 								</Grid>
@@ -256,8 +256,8 @@
                                       />
                       
                   <Label Content="Stunden ges." Grid.Column="0"  Grid.Row="2"/>
-                      <dxe:SpinEdit MinValue="0" Increment="5" IsFloatValue="True" AllowNullInput="False" x:Name="numeric_duration3"
-                                    EditValue="{Binding Path=DurationMonthYearGes, Mode=TwoWay,  StringFormat=N2, UpdateSourceTrigger=PropertyChanged}"
+                      <dxe:SpinEdit MinValue="0" Increment="5" IsFloatValue="True" AllowNullInput="False" x:Name="numeric_duration3" Mask="########0.##" MaskUseAsDisplayFormat="True"
+                                    EditValue="{Binding Path=DurationMonthYearGes, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                     Grid.Column="3" Grid.Row="2"
                                     Height="23" Margin="3,0,3,3"/>
 
diff --git a/BeWo/View/Detail/ServiceRecordEditView.xaml.cs b/BeWo/View/Detail/ServiceRecordEditView.xaml.cs
index bb45e1eff..9248f6ed6 100644
--- a/BeWo/View/Detail/ServiceRecordEditView.xaml.cs
+++ b/BeWo/View/Detail/ServiceRecordEditView.xaml.cs
@@ -210,10 +210,12 @@ namespace BeWo.View.Detail
                     MinStdDauerlbl.SetValue(Grid.ColumnProperty, 0);
                     numeric_duration.SetValue(Grid.ColumnProperty, 1);
                     numeric_duration.IsFloatValue = true;
+                    numeric_duration.Mask = "########0.##";
                 }
                 else
                 {
                     numeric_duration.IsFloatValue = false;
+                    numeric_duration.Mask = "########";
                 }
             }
             else 
@@ -243,9 +245,12 @@ namespace BeWo.View.Detail
                         numerictb_duration.SetValue(Grid.ColumnProperty,1);
                         MinStdDauerLabel.Content = "Dauer";
                         numerictb_duration.IsFloatValue = true;
-                    }else
+                        numerictb_duration.Mask = "########0.##";
+                    }
+                else { 
                         numerictb_duration.IsFloatValue = false;
-
+                        numerictb_duration.Mask = "########";
+                    }
 
                 }
         }
@@ -516,5 +521,32 @@ namespace BeWo.View.Detail
         //    //SetSelectedSupportConceptOid(21);
 
         //}
+        private void MinSTDOhneEnd_OnSelectedIndexChanged(object sender, RoutedEventArgs e)
+        {
+            if (MinSTDOhneEnd.Text == ZeiterfassungsDauer.Minuten.ToString())
+            {
+                numerictb_duration.IsFloatValue = false;
+                numeric_duration.Mask = "########";
+            }
+            else
+            {
+                numerictb_duration.IsFloatValue = true;
+                numeric_duration.Mask = "########0.##";
+            }
+        }
+
+        private void MinSTDMitEnd_OnSelectedIndexChanged(object sender, RoutedEventArgs e)
+        {
+            if (MinSTDMitEnd.Text == ZeiterfassungsDauer.Minuten.ToString())
+            {
+                numeric_duration.IsFloatValue = false;
+                numeric_duration.Mask = "########";
+            }
+            else
+            {
+                numeric_duration.IsFloatValue = true;
+                numeric_duration.Mask = "########0.##";
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/BeWo/View/Detail/ServiceRecordGroupEditView.xaml b/BeWo/View/Detail/ServiceRecordGroupEditView.xaml
index 97b6bff04..9a60a7b80 100644
--- a/BeWo/View/Detail/ServiceRecordGroupEditView.xaml
+++ b/BeWo/View/Detail/ServiceRecordGroupEditView.xaml
@@ -148,8 +148,8 @@
 
 
                   <Label Content="Dauer (min)" Grid.Column="2" x:Name="MinStdDauerLabel" Grid.Row="2"/>
-                  <dxe:SpinEdit MinValue="0" Increment="5" IsFloatValue="False" AllowNullInput="False" x:Name="numerictb_duration"
-                                EditValue="{Binding Path=Duration, Mode=TwoWay, StringFormat=N2, UpdateSourceTrigger=PropertyChanged}"
+                  <dxe:SpinEdit MinValue="0" Increment="5" IsFloatValue="False" AllowNullInput="False" x:Name="numerictb_duration" Mask="########" MaskUseAsDisplayFormat="True"
+                                EditValue="{Binding Path=Duration, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                 Grid.Column="3" Grid.Row="2"
                                 Height="23" Margin="3,0,3,3"/>
 
@@ -157,7 +157,7 @@
 
                   <dxe:ComboBoxEdit ItemsSource="{x:Static core:EnumTranslations.ZeiterfassungsDauerTranslations}" Grid.Column="2" Grid.ColumnSpan="2" Grid.Row="2" Margin="3,0,3,3"
                                 EditValue="{Binding Path=DurationInStunden, UpdateSourceTrigger=PropertyChanged}" DisplayMember="Value" ValueMember="Key"
-                                IsTextEditable="False" x:Name="MinSTDOhneEnd" Visibility="Collapsed"/>
+                                IsTextEditable="False" x:Name="MinSTDOhneEnd" Visibility="Collapsed" SelectedIndexChanged="MinSTDOhneEnd_OnSelectedIndexChanged "/>
 
                 </Grid>
                                                        
@@ -207,8 +207,8 @@
 
 
                   <Label Content="Dauer" Grid.Column="2" x:Name="MinStdDauerlbl" Grid.Row="2"/>
-                  <dxe:SpinEdit MinValue="0" Increment="5" IsFloatValue="False" AllowNullInput="False" x:Name="numeric_duration"
-                                EditValue="{Binding Path=DurationSTD, Mode=TwoWay,  StringFormat=N2, UpdateSourceTrigger=PropertyChanged}"
+                  <dxe:SpinEdit MinValue="0" Increment="5" IsFloatValue="False" AllowNullInput="False" x:Name="numeric_duration" Mask="########" MaskUseAsDisplayFormat="True"
+                                EditValue="{Binding Path=DurationSTD, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                 Grid.Column="3" Grid.Row="2"
                                 Height="23" Margin="3,0,3,3"/>
 
@@ -216,7 +216,7 @@
 
                   <dxe:ComboBoxEdit ItemsSource="{x:Static core:EnumTranslations.ZeiterfassungsDauerTranslations}" Grid.Column="2" Grid.ColumnSpan="2" Grid.Row="2" Margin="3,0,3,3"
                                 EditValue="{Binding Path=DurationInStunden, UpdateSourceTrigger=PropertyChanged}" DisplayMember="Value" ValueMember="Key"
-                                IsTextEditable="False" x:Name="MinSTDMitEnd" Visibility="Collapsed" />
+                                IsTextEditable="False" x:Name="MinSTDMitEnd" Visibility="Collapsed" SelectedIndexChanged="MinSTDMitEnd_OnSelectedIndexChanged "/>
 
 
                 </Grid>               
@@ -253,8 +253,8 @@
                        
                   
                   <Label Content="Stunden ges." Grid.Column="0"  Grid.Row="2"/>
-                  <dxe:SpinEdit MinValue="0" Increment="5" IsFloatValue="True" AllowNullInput="False" x:Name="numeric_duration3"
-                                EditValue="{Binding Path=DurationMonthYearGes, Mode=TwoWay,  StringFormat=N2, UpdateSourceTrigger=PropertyChanged}"
+                  <dxe:SpinEdit MinValue="0" Increment="5" IsFloatValue="True" AllowNullInput="False" x:Name="numeric_duration3" Mask="########0.##" MaskUseAsDisplayFormat="True"
+                                EditValue="{Binding Path=DurationMonthYearGes, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                 Grid.Column="3" Grid.Row="2"
                                 Height="23" Margin="3,0,3,3"/>
 
diff --git a/BeWo/View/Detail/ServiceRecordGroupEditView.xaml.cs b/BeWo/View/Detail/ServiceRecordGroupEditView.xaml.cs
index 83e240364..16d81e717 100644
--- a/BeWo/View/Detail/ServiceRecordGroupEditView.xaml.cs
+++ b/BeWo/View/Detail/ServiceRecordGroupEditView.xaml.cs
@@ -700,8 +700,13 @@ namespace BeWo.View.Detail
                     MinStdDauerlbl.SetValue(Grid.ColumnProperty, 0);
                     numeric_duration.SetValue(Grid.ColumnProperty, 1);
                     numeric_duration.IsFloatValue = true;
-                }else
+                    numeric_duration.Mask = "########0.##";
+                }
+                else
+                {
                     numeric_duration.IsFloatValue = false;
+                    numeric_duration.Mask = "########";
+                }
             }
             else
                 if (scv == ServiceRecordFormate.ZeiterfassungMitMonatJahr /*Settings.IsOnlyYearMonthVisible*/)
@@ -731,11 +736,41 @@ namespace BeWo.View.Detail
                         numerictb_duration.SetValue(Grid.ColumnProperty, 1);
                         MinStdDauerLabel.Content = "Dauer";
                         numerictb_duration.IsFloatValue = true;
-                    }else
+                        numerictb_duration.Mask = "########0.##";
+                } else { 
                         numerictb_duration.IsFloatValue = false;
-
+                        numerictb_duration.Mask = "########";
+                    }
+         
                 }
-            
+        }
+
+        private void MinSTDMitEnd_OnSelectedIndexChanged(object sender, RoutedEventArgs e)
+        {
+            if (MinSTDMitEnd.Text == ZeiterfassungsDauer.Minuten.ToString())
+            {
+                numeric_duration.IsFloatValue = false;
+                numeric_duration.Mask = "########";
+            }
+            else
+            {
+                numeric_duration.IsFloatValue = true;
+                numeric_duration.Mask = "########0.##";
+            }
+        }
+
+        private void MinSTDOhneEnd_OnSelectedIndexChanged(object sender, RoutedEventArgs e)
+        {
+            if (MinSTDOhneEnd.Text == ZeiterfassungsDauer.Minuten.ToString())
+            {
+                numerictb_duration.IsFloatValue = false;
+                numeric_duration.Mask = "########";
+            }
+            else
+            {
+                numerictb_duration.IsFloatValue = true;
+                numeric_duration.Mask = "########0.##";
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/BeWo/View/Detail/ServiceRecordView2.xaml b/BeWo/View/Detail/ServiceRecordView2.xaml
index 2fb2bdf92..6827b2157 100644
--- a/BeWo/View/Detail/ServiceRecordView2.xaml
+++ b/BeWo/View/Detail/ServiceRecordView2.xaml
@@ -691,8 +691,8 @@
 														
                                                  
                                                     <Label Content="Dauer" Grid.Column="2" x:Name="MinStdDauerlbl" Grid.Row="2"/>
-                                                        <dxe:SpinEdit MinValue="0" Increment="5" IsFloatValue="False" AllowNullInput="False" x:Name="numeric_duration"
-                                                                      EditValue="{Binding Path=PrototypeVM.DurationSTD, Mode=TwoWay, StringFormat=N2, UpdateSourceTrigger=PropertyChanged}"
+                                                        <dxe:SpinEdit MinValue="0" Increment="5" IsFloatValue="False" AllowNullInput="False" x:Name="numeric_duration" Mask="########" MaskUseAsDisplayFormat="True"
+                                                                      EditValue="{Binding Path=PrototypeVM.DurationSTD, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                                                       Grid.Column="3" Grid.Row="2" 
                                                                       Height="23" Margin="3,0,3,3"/>
 
@@ -750,8 +750,8 @@
                                                       
                                                       
                                                         <Label Content="Dauer (min)" Grid.Column="2" x:Name="MinStdDauerLabel" Grid.Row="2"/>
-                                                        <dxe:SpinEdit MinValue="0" Increment="5" IsFloatValue="False" AllowNullInput="False" x:Name="numerictb_duration" 
-                                                                      EditValue="{Binding Path=PrototypeVM.Duration, Mode=TwoWay, StringFormat=N2, UpdateSourceTrigger=PropertyChanged}"
+                                                        <dxe:SpinEdit MinValue="0" Increment="5" IsFloatValue="False" AllowNullInput="False" x:Name="numerictb_duration" Mask="########" MaskUseAsDisplayFormat="True"
+                                                                      EditValue="{Binding Path=PrototypeVM.Duration, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                                                       Grid.Column="3" Grid.Row="2" 
                                                                       Height="23" Margin="3,0,3,3"/>
 
@@ -795,13 +795,13 @@
                                                                         ItemsSource="{Binding Path=PrototypeVM.MonateBinden}" />
 
                                                         <Label Content="Stunden ges." Grid.Column="0"  Grid.Row="2"/>
-                                                        <dxe:SpinEdit MinValue="0" Increment="5" IsFloatValue="True" AllowNullInput="False" x:Name="numeric_duration3" 
-                                                                        EditValue="{Binding Path=PrototypeVM.DurationMonthYearGes, Mode=TwoWay, StringFormat=N2, UpdateSourceTrigger=PropertyChanged}"
+                                                        <dxe:SpinEdit MinValue="0" Increment="5" IsFloatValue="True" AllowNullInput="False" x:Name="numeric_duration3" Mask="########0.##" MaskUseAsDisplayFormat="True"
+                                                                        EditValue="{Binding Path=PrototypeVM.DurationMonthYearGes, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                                                         Grid.Column="3" Grid.Row="2"
                                                                         Height="23" Margin="3,0,3,3"/>
                                                  
 												</Grid>                                                      
-                                                  <!-- ##############################################################################MaskType="Numeric" Mask="N2" MaskUseAsDisplayFormat="True"#############################################################-->
+                                                  <!-- ############################################################################ConverterCulture='de-DE' ,##MaskType="Numeric" Mask="N2" MaskUseAsDisplayFormat="True"#############################################################-->
 
                                                     <!-- ########################## Gefahrene Kilometer ############### -->
                                                          
diff --git a/BeWo/View/Detail/ServiceRecordView2.xaml.cs b/BeWo/View/Detail/ServiceRecordView2.xaml.cs
index 8f46bd2d2..87a5721ce 100644
--- a/BeWo/View/Detail/ServiceRecordView2.xaml.cs
+++ b/BeWo/View/Detail/ServiceRecordView2.xaml.cs
@@ -293,14 +293,21 @@ namespace BeWo.View.Detail
                         MinSTDMitEnd.Visibility = Visibility.Visible;
                         MinStdDauerlbl.SetValue(Grid.ColumnProperty, 0);
                         numeric_duration.SetValue(Grid.ColumnProperty, 1);
+                        numeric_duration.IsFloatValue = true;
+                        numeric_duration.Mask = "########0.##";
                     }
-		
+                    else
+                    {
+                        numeric_duration.IsFloatValue = false;
+                        numeric_duration.Mask = "########";
+                    }
+
                     EndDatumHeader.Visible = true;
 
-                numerictb_distance.SetValue(WidthProperty, (double)47);
-                numerictb_distance.SetValue(HorizontalAlignmentProperty, HorizontalAlignment.Right);
+                    numerictb_distance.SetValue(WidthProperty, (double)47);
+                    numerictb_distance.SetValue(HorizontalAlignmentProperty, HorizontalAlignment.Right);
 
-            }
+                }
                 else
                 {
 				    GridMitEnddatum.Visibility = Visibility.Collapsed;
@@ -318,6 +325,13 @@ namespace BeWo.View.Detail
                         MinStdDauerLabel.SetValue(Grid.ColumnProperty, 0);
                         numerictb_duration.SetValue(Grid.ColumnProperty, 1);
                         MinStdDauerLabel.Content = "Dauer";
+                        numerictb_duration.IsFloatValue = true;
+                        numerictb_duration.Mask = "########0.##";
+                    }
+                    else
+                    {
+                        numerictb_duration.IsFloatValue = false;
+                        numerictb_duration.Mask = "########";
                     }
 
                     EndDatumHeader.Visible = false;
@@ -4003,18 +4017,26 @@ namespace BeWo.View.Detail
 
         private void MinSTDOhneEnd_OnSelectedIndexChanged(object sender, RoutedEventArgs e)
         {
-            if(MinSTDOhneEnd.Text == ZeiterfassungsDauer.Minuten.ToString())
+            if(MinSTDOhneEnd.Text == ZeiterfassungsDauer.Minuten.ToString()) { 
                 numerictb_duration.IsFloatValue = false;
-            else
+                numeric_duration.Mask = "########";
+            }
+            else { 
                 numerictb_duration.IsFloatValue = true;
+                numeric_duration.Mask = "########0.##";
+            }
         }
 
         private void MinSTDMitEnd_OnSelectedIndexChanged(object sender, RoutedEventArgs e)
         {
-            if (MinSTDMitEnd.Text == ZeiterfassungsDauer.Minuten.ToString())
+            if (MinSTDMitEnd.Text == ZeiterfassungsDauer.Minuten.ToString()) { 
                 numeric_duration.IsFloatValue = false;
-            else
+                numeric_duration.Mask = "########";
+            }
+            else { 
                 numeric_duration.IsFloatValue = true;
+                numeric_duration.Mask = "########0.##";
+            }
         }
     }
 }
\ No newline at end of file