diff --git a/src/app/appmarket/appmanagement/app-create-wizard/app-create-wizard.component.html b/src/app/appmarket/appmanagement/app-create-wizard/app-create-wizard.component.html
index 66ea3130ac1ec41723181a881b8e582b6283f327..7a6ad88dbe668bbd072bb80d74e8415c31fbe6fb 100644
--- a/src/app/appmarket/appmanagement/app-create-wizard/app-create-wizard.component.html
+++ b/src/app/appmarket/appmanagement/app-create-wizard/app-create-wizard.component.html
@@ -410,7 +410,8 @@
                                    (change)="changeDefaultElementInForms()"
                                    [defaultChecked]="false"
                                    [(ngModel)]="applicationDTO.application.appConfigurationSpec.configFileRepositoryRequired"
-                                   tooltip="{{'APPS_WIZARD.REPOSITORY_REQUIRED_TOOLTIP' | translate}}" [display]="true"
+                                   tooltip="{{'APPS_WIZARD.REPOSITORY_REQUIRED_TOOLTIP' | translate}}"
+                                   [display]="true"
                                    [options]="defaultTooltipOptions">
                         </div>
                     </div>
@@ -427,8 +428,10 @@
                                class="col-sm-2 control-label">{{'APPS_WIZARD.BASIC_AUTH_LABEL' | translate}}</label>
                         <div class="col-sm-10">
                             <input type="checkbox" id="basicAuth" name="basicAuth" (change)="changeBasicAuthInForms()"
-                                   [defaultChecked]="hasAlreadyBasicAuth()" [(ngModel)]="basicAuth"
-                                   tooltip="{{'APPS_WIZARD.BASIC_AUTH_TOOLTIP' | translate}}" [display]="true"
+                                   [defaultChecked]="hasAlreadyBasicAuth()"
+                                   [(ngModel)]="basicAuth"
+                                   tooltip="{{'APPS_WIZARD.BASIC_AUTH_TOOLTIP' | translate}}"
+                                   [display]="true"
                                    [options]="defaultTooltipOptions">
                         </div>
                     </div>
@@ -437,9 +440,7 @@
                                class="col-sm-2 control-label">{{'APPS_WIZARD.TERMS_ACCEPTANCE_LABEL' | translate}}</label>
                         <div class="col-sm-10">
                             <input type="checkbox" id="termsAcceptance" name="termsAcceptance"
-                                   (change)="changeTermsAcceptanceInForms()"
-                                   [defaultChecked]="hasAlreadyTermsAcceptance()"
-                                   [(ngModel)]="termsAcceptance"
+                                   [(ngModel)]="applicationDTO.application.appConfigurationSpec.termsAcceptanceRequired"
                                    tooltip="{{'APPS_WIZARD.TERMS_ACCEPTANCE_TOOLTIP' | translate}}"
                                    [display]="true"
                                    [options]="defaultTooltipOptions">
diff --git a/src/app/appmarket/appmanagement/app-create-wizard/app-create-wizard.component.ts b/src/app/appmarket/appmanagement/app-create-wizard/app-create-wizard.component.ts
index b7b1517f3d8c5a7d979675893f7c4071de2ac182..8868ff287e678f56594a4d36c6075f56644f67f6 100644
--- a/src/app/appmarket/appmanagement/app-create-wizard/app-create-wizard.component.ts
+++ b/src/app/appmarket/appmanagement/app-create-wizard/app-create-wizard.component.ts
@@ -472,6 +472,7 @@ export class AppCreateWizardComponent extends BaseComponent implements OnInit {
         }, 1);
     }
 
+    // terms acceptance related methods are not used for now
     public changeTermsAcceptanceInForms() {
         this.formDisplayChange = false;
         this.handleTermsAcceptance();
diff --git a/src/app/appmarket/appmanagement/app-version-create-wizard/app-version-create-wizard.component.html b/src/app/appmarket/appmanagement/app-version-create-wizard/app-version-create-wizard.component.html
index 99876c824d17aaed7d1f9d0275738cf70e1ed043..4cb4747fc34aaafb68b23255ec6994949dd934e6 100644
--- a/src/app/appmarket/appmanagement/app-version-create-wizard/app-version-create-wizard.component.html
+++ b/src/app/appmarket/appmanagement/app-version-create-wizard/app-version-create-wizard.component.html
@@ -174,9 +174,7 @@
                    class="col-sm-2 control-label">{{'APPS_WIZARD.TERMS_ACCEPTANCE_LABEL' | translate}}</label>
             <div class="col-sm-10">
               <input type="checkbox" id="termsAcceptance" name="termsAcceptance"
-                     (change)="changeTermsAcceptanceInForms()"
-                     [defaultChecked]="hasAlreadyTermsAcceptance()"
-                     [(ngModel)]="termsAcceptance"
+                     [(ngModel)]="applicationDTO.application.appConfigurationSpec.termsAcceptanceRequired"
                      tooltip="{{'APPS_WIZARD.TERMS_ACCEPTANCE_TOOLTIP' | translate}}"
                      [display]="true"
                      [options]="defaultTooltipOptions">
diff --git a/src/app/appmarket/appmanagement/app-version-create-wizard/app-version-create-wizard.component.ts b/src/app/appmarket/appmanagement/app-version-create-wizard/app-version-create-wizard.component.ts
index 7eec43b13856388e2474cf8f7b7469d652cf8d1e..48c51ba41aa9e958c8270337a86eb4a6cb79a614 100644
--- a/src/app/appmarket/appmanagement/app-version-create-wizard/app-version-create-wizard.component.ts
+++ b/src/app/appmarket/appmanagement/app-version-create-wizard/app-version-create-wizard.component.ts
@@ -332,6 +332,7 @@ export class AppVersionCreateWizardComponent extends BaseComponent implements On
         }
     }
 
+    // terms acceptance related methods are not used for now
     public changeTermsAcceptanceInForms() {
         this.formDisplayChange = false;
         this.handleTermsAcceptance();