diff --git a/app/src/main/java/ch/pizzamaxx/android/activity/CampaignProductDetailsActivity.java b/app/src/main/java/ch/pizzamaxx/android/activity/CampaignProductDetailsActivity.java
index e37d0e7..3711a57 100644
--- a/app/src/main/java/ch/pizzamaxx/android/activity/CampaignProductDetailsActivity.java
+++ b/app/src/main/java/ch/pizzamaxx/android/activity/CampaignProductDetailsActivity.java
@@ -125,6 +125,7 @@ public class CampaignProductDetailsActivity extends BaseActivity {
             for(MenuProductOptionValueModel menuProductOptionValueModel : menuProductOptionModel.getOptionValueModelList()){
                 if(menuProductOptionValueModel.getPrice().equals("0") || menuProductOptionValueModel.getPrice().equals("0.00")){
 
+                    /*
                     //checkbox
                     if(!(menuProductOptionModel.getType().toLowerCase().equals("radio") ||
                             menuProductOptionModel.getType().toLowerCase().equals("select"))){
@@ -135,6 +136,13 @@ public class CampaignProductDetailsActivity extends BaseActivity {
                     else if(!isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList())){
                         menuProductOptionValueModel.setSelected(true);
                     }
+                    */
+
+                    if((menuProductOptionModel.getType().toLowerCase().equals("radio") ||
+                            menuProductOptionModel.getType().toLowerCase().equals("select") &&
+                                    !isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList()))){
+                        menuProductOptionValueModel.setSelected(true);
+                    }
 
                 }
             }
@@ -245,6 +253,7 @@ public class CampaignProductDetailsActivity extends BaseActivity {
         for(MenuProductOptionValueModel menuProductOptionValueModel : menuProductOptionModel.getOptionValueModelList()){
             if(menuProductOptionValueModel.getPrice().equals("0") || menuProductOptionValueModel.getPrice().equals("0.00")){
 
+                /*
                 //checkbox
                 if(!(menuProductOptionModel.getType().toLowerCase().equals("radio") ||
                         menuProductOptionModel.getType().toLowerCase().equals("select"))){
@@ -255,6 +264,13 @@ public class CampaignProductDetailsActivity extends BaseActivity {
                 else if(!isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList())){
                     menuProductOptionValueModel.setSelected(true);
                 }
+                */
+
+                if((menuProductOptionModel.getType().toLowerCase().equals("radio") ||
+                        menuProductOptionModel.getType().toLowerCase().equals("select") &&
+                                !isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList()))){
+                    menuProductOptionValueModel.setSelected(true);
+                }
             }
         }
     }
diff --git a/app/src/main/java/ch/pizzamaxx/android/activity/ProductDetailsActivity.java b/app/src/main/java/ch/pizzamaxx/android/activity/ProductDetailsActivity.java
index b88b8c5..3cfe820 100644
--- a/app/src/main/java/ch/pizzamaxx/android/activity/ProductDetailsActivity.java
+++ b/app/src/main/java/ch/pizzamaxx/android/activity/ProductDetailsActivity.java
@@ -130,7 +130,7 @@ public class ProductDetailsActivity extends BaseActivity {
         for(MenuProductOptionModel menuProductOptionModel : menuProductModel.getProductOptionList()){
             for(MenuProductOptionValueModel menuProductOptionValueModel : menuProductOptionModel.getOptionValueModelList()){
                 if(menuProductOptionValueModel.getPrice().equals("0") || menuProductOptionValueModel.getPrice().equals("0.00")){
-
+                    /*
                     //checkbox
                     if(!(menuProductOptionModel.getType().toLowerCase().equals("radio") ||
                             menuProductOptionModel.getType().toLowerCase().equals("select"))){
@@ -141,6 +141,12 @@ public class ProductDetailsActivity extends BaseActivity {
                     else if(!isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList())){
                         menuProductOptionValueModel.setSelected(true);
                     }
+                    */
+                    if((menuProductOptionModel.getType().toLowerCase().equals("radio") ||
+                            menuProductOptionModel.getType().toLowerCase().equals("select") &&
+                                    !isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList()))){
+                        menuProductOptionValueModel.setSelected(true);
+                    }
 
                 }
             }
@@ -251,6 +257,7 @@ public class ProductDetailsActivity extends BaseActivity {
         for(MenuProductOptionValueModel menuProductOptionValueModel : menuProductOptionModel.getOptionValueModelList()){
             if(menuProductOptionValueModel.getPrice().equals("0") || menuProductOptionValueModel.getPrice().equals("0.00")){
 
+                /*
                 //checkbox
                 if(!(menuProductOptionModel.getType().toLowerCase().equals("radio") ||
                         menuProductOptionModel.getType().toLowerCase().equals("select"))){
@@ -261,6 +268,13 @@ public class ProductDetailsActivity extends BaseActivity {
                 else if(!isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList())){
                     menuProductOptionValueModel.setSelected(true);
                 }
+                */
+
+                if((menuProductOptionModel.getType().toLowerCase().equals("radio") ||
+                        menuProductOptionModel.getType().toLowerCase().equals("select") &&
+                                !isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList()))){
+                    menuProductOptionValueModel.setSelected(true);
+                }
             }
         }
     }
diff --git a/app/src/main/java/ch/pizzamaxx/android/api/ApiService.java b/app/src/main/java/ch/pizzamaxx/android/api/ApiService.java
index c7c9373..b703891 100644
--- a/app/src/main/java/ch/pizzamaxx/android/api/ApiService.java
+++ b/app/src/main/java/ch/pizzamaxx/android/api/ApiService.java
@@ -50,7 +50,7 @@ public class ApiService {
 
         HttpLoggingInterceptor logging = new HttpLoggingInterceptor();  // set your desired log level
         logging.setLevel(HttpLoggingInterceptor.Level.BODY);
-        builder.addInterceptor(logging);
+        //builder.addInterceptor(logging);
 
         OkHttpClient client = builder.build();
 
diff --git a/app/src/main/java/ch/pizzamaxx/android/dialog/ProductPropertiesBottomSheetDialog.java b/app/src/main/java/ch/pizzamaxx/android/dialog/ProductPropertiesBottomSheetDialog.java
index 4a74460..9c7113a 100644
--- a/app/src/main/java/ch/pizzamaxx/android/dialog/ProductPropertiesBottomSheetDialog.java
+++ b/app/src/main/java/ch/pizzamaxx/android/dialog/ProductPropertiesBottomSheetDialog.java
@@ -137,6 +137,7 @@ public class ProductPropertiesBottomSheetDialog extends BottomSheetDialogFragmen
             for(MenuProductOptionValueModel menuProductOptionValueModel : menuProductOptionModel.getOptionValueModelList()){
                 if(menuProductOptionValueModel.getPrice().equals("0") || menuProductOptionValueModel.getPrice().equals("0.00")){
 
+                    /*
                     //checkbox
                     if(!(menuProductOptionModel.getType().toLowerCase().equals("radio") ||
                             menuProductOptionModel.getType().toLowerCase().equals("select"))){
@@ -147,6 +148,12 @@ public class ProductPropertiesBottomSheetDialog extends BottomSheetDialogFragmen
                     else if(!isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList())){
                         menuProductOptionValueModel.setSelected(true);
                     }
+                    */
+                    if((menuProductOptionModel.getType().toLowerCase().equals("radio") ||
+                            menuProductOptionModel.getType().toLowerCase().equals("select") &&
+                                    !isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList()))){
+                        menuProductOptionValueModel.setSelected(true);
+                    }
 
                 }
             }
@@ -253,6 +260,7 @@ public class ProductPropertiesBottomSheetDialog extends BottomSheetDialogFragmen
         for(MenuProductOptionValueModel menuProductOptionValueModel : menuProductOptionModel.getOptionValueModelList()){
             if(menuProductOptionValueModel.getPrice().equals("0") || menuProductOptionValueModel.getPrice().equals("0.00")){
 
+                /*
                 //checkbox
                 if(!(menuProductOptionModel.getType().toLowerCase().equals("radio") ||
                         menuProductOptionModel.getType().toLowerCase().equals("select"))){
@@ -263,6 +271,13 @@ public class ProductPropertiesBottomSheetDialog extends BottomSheetDialogFragmen
                 else if(!isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList())){
                         menuProductOptionValueModel.setSelected(true);
                     }
+                    */
+
+                if((menuProductOptionModel.getType().toLowerCase().equals("radio") ||
+                        menuProductOptionModel.getType().toLowerCase().equals("select") &&
+                                !isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList()))){
+                    menuProductOptionValueModel.setSelected(true);
+                }
             }
         }
     }