diff --git a/gehGassiApp/gehGassiApp/ViewModels/More/AddPaymentUserViewModel.cs b/gehGassiApp/gehGassiApp/ViewModels/More/AddPaymentUserViewModel.cs
index 702329a..7ee040e 100644
--- a/gehGassiApp/gehGassiApp/ViewModels/More/AddPaymentUserViewModel.cs
+++ b/gehGassiApp/gehGassiApp/ViewModels/More/AddPaymentUserViewModel.cs
@@ -81,7 +81,7 @@ namespace gehGassiApp.ViewModels.More
         /// Hat der Benutzer die MangoPay-AGB akzeptiert?
         /// </summary>
         [ObservableProperty]
-        private bool _acceptedTermsMangopay;
+        private bool _acceptedTermsMangopay = true;
 
         #region Commands
 
@@ -177,7 +177,7 @@ namespace gehGassiApp.ViewModels.More
             {
                 SelectedNationality = null;
                 SelectedMainResidence = null;
-                AcceptedTermsMangopay = false;
+                AcceptedTermsMangopay = true;
 
                 IsBusy = true;
                 await Task.Delay(Core.Common.Constants.AnimationDelayDetails);
diff --git a/gehGassiApp/gehGassiApp/ViewModels/More/BecomeWalkerViewmodel.cs b/gehGassiApp/gehGassiApp/ViewModels/More/BecomeWalkerViewmodel.cs
index 5cd4335..cb7d7fc 100644
--- a/gehGassiApp/gehGassiApp/ViewModels/More/BecomeWalkerViewmodel.cs
+++ b/gehGassiApp/gehGassiApp/ViewModels/More/BecomeWalkerViewmodel.cs
@@ -91,7 +91,7 @@ namespace gehGassiApp.ViewModels.More
         /// Hat der Benutzer die MangoPay-AGB akzeptiert?
         /// </summary>
         [ObservableProperty]
-        private bool _acceptedTermsMangopay;
+        private bool _acceptedTermsMangopay = true;
 
         #region Commands
 
@@ -193,7 +193,7 @@ namespace gehGassiApp.ViewModels.More
             {
                 SelectedNationality = null;
                 SelectedMainResidence = null;
-                AcceptedTermsMangopay = false;
+                AcceptedTermsMangopay = true;
 
                 IsBusy = true;
                 await Task.Delay(Core.Common.Constants.AnimationDelayDetails);
diff --git a/gehGassiApp/gehGassiApp/Views/Account/LoginFormView.xaml b/gehGassiApp/gehGassiApp/Views/Account/LoginFormView.xaml
index 99494b8..753c6c1 100644
--- a/gehGassiApp/gehGassiApp/Views/Account/LoginFormView.xaml
+++ b/gehGassiApp/gehGassiApp/Views/Account/LoginFormView.xaml
@@ -35,6 +35,7 @@
                     <Entry
                         x:Name="email"
                         Keyboard="Email"
+                        AutomationId="Login"
                         Placeholder="{x:Static res:Text.Login_Username}"
                         Text="{Binding Email}">
                         <Entry.Behaviors>
@@ -48,6 +49,7 @@
                         <Entry
                             Grid.Column="0"
                             HorizontalOptions="Fill"
+                            AutomationId="Password"
                             IsPassword="{Binding Source={x:Reference showPasswordTrigger}, Path=HidePassword}"
                             Keyboard="Text"
                             Placeholder="{x:Static res:Text.Login_Password}"
diff --git a/gehGassiApp/gehGassiApp/Views/More/AddPaymentUserView.xaml b/gehGassiApp/gehGassiApp/Views/More/AddPaymentUserView.xaml
index d7124d1..15c22c2 100644
--- a/gehGassiApp/gehGassiApp/Views/More/AddPaymentUserView.xaml
+++ b/gehGassiApp/gehGassiApp/Views/More/AddPaymentUserView.xaml
@@ -64,7 +64,7 @@
                         ItemsSource="{Binding MainResidences}"
                         SelectedItem="{Binding SelectedMainResidence}" />
                 </Border>                
-                <Grid
+                <!-- <Grid
                     Margin="{StaticResource MarginBig}"
                     ColumnDefinitions="*,Auto"
                     ColumnSpacing="10">
@@ -83,7 +83,7 @@
                         HorizontalOptions="End"
                         IsToggled="{Binding AcceptedTermsMangopay}"
                         VerticalOptions="Center" />
-                </Grid>
+                </Grid> -->
 
                 <ActivityIndicator
                     HorizontalOptions="Center"
diff --git a/gehGassiApp/gehGassiApp/Views/More/BecomeWalkerView.xaml b/gehGassiApp/gehGassiApp/Views/More/BecomeWalkerView.xaml
index 2ba1889..19f8109 100644
--- a/gehGassiApp/gehGassiApp/Views/More/BecomeWalkerView.xaml
+++ b/gehGassiApp/gehGassiApp/Views/More/BecomeWalkerView.xaml
@@ -64,8 +64,8 @@
                         ItemDisplayBinding="{Binding Name}"
                         ItemsSource="{Binding MainResidences}"
                         SelectedItem="{Binding SelectedMainResidence}" />
-                </Border>                
-                <Grid
+                </Border>
+                <!-- <Grid
                     Margin="{StaticResource MarginBig}"
                     ColumnDefinitions="*,Auto"
                     ColumnSpacing="10">
@@ -84,7 +84,7 @@
                         HorizontalOptions="End"
                         IsToggled="{Binding AcceptedTermsMangopay}"
                         VerticalOptions="Center" />
-                </Grid>
+                </Grid>-->
 
                 <ActivityIndicator
                     HorizontalOptions="Center"