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 b2077c3a127c356594da66d6c42b79bb2eaf48f7..66ea3130ac1ec41723181a881b8e582b6283f327 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
@@ -438,8 +438,10 @@
                         <div class="col-sm-10">
                             <input type="checkbox" id="termsAcceptance" name="termsAcceptance"
                                    (change)="changeTermsAcceptanceInForms()"
-                                   [defaultChecked]="hasAlreadyBasicAuth()" [(ngModel)]="termsAcceptance"
-                                   tooltip="{{'APPS_WIZARD.TERMS_ACCEPTANCE_TOOLTIP' | translate}}" [display]="true"
+                                   [defaultChecked]="hasAlreadyTermsAcceptance()"
+                                   [(ngModel)]="termsAcceptance"
+                                   tooltip="{{'APPS_WIZARD.TERMS_ACCEPTANCE_TOOLTIP' | translate}}"
+                                   [display]="true"
                                    [options]="defaultTooltipOptions">
                         </div>
                     </div>
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 0ad0b4ccd62d25a9b1533f41008b6464ed05a2c0..99876c824d17aaed7d1f9d0275738cf70e1ed043 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
@@ -160,7 +160,13 @@
           <div class="form-group form-group-sm">
             <label for="basicAuth" style="text-align: left; padding-left: 0;" 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" [options]="defaultTooltipOptions">
+              <input type="checkbox" id="basicAuth" name="basicAuth"
+                     (change)="changeBasicAuthInForms()"
+                     [defaultChecked]="hasAlreadyBasicAuth()"
+                     [(ngModel)]="basicAuth"
+                     tooltip="{{'APPS_WIZARD.BASIC_AUTH_TOOLTIP' | translate}}"
+                     [display]="true"
+                     [options]="defaultTooltipOptions">
             </div>
           </div>
           <div class="form-group form-group-sm">
@@ -169,8 +175,10 @@
             <div class="col-sm-10">
               <input type="checkbox" id="termsAcceptance" name="termsAcceptance"
                      (change)="changeTermsAcceptanceInForms()"
-                     [defaultChecked]="hasAlreadyBasicAuth()" [(ngModel)]="termsAcceptance"
-                     tooltip="{{'APPS_WIZARD.TERMS_ACCEPTANCE_TOOLTIP' | translate}}" [display]="true"
+                     [defaultChecked]="hasAlreadyTermsAcceptance()"
+                     [(ngModel)]="termsAcceptance"
+                     tooltip="{{'APPS_WIZARD.TERMS_ACCEPTANCE_TOOLTIP' | translate}}"
+                     [display]="true"
                      [options]="defaultTooltipOptions">
             </div>
           </div>
@@ -180,8 +188,10 @@
             <div class="col-sm-10">
                             <textarea id="termsContent" name="termsContent" class="form-control" rows="7"
                                       [(ngModel)]="termsContent"
-                                      tooltip="{{'APPS_WIZARD.TERMS_CONTENT_TOOLTIP' | translate}}" [display]="true"
-                                      [options]="defaultTooltipOptions"></textarea>
+                                      tooltip="{{'APPS_WIZARD.TERMS_CONTENT_TOOLTIP' | translate}}"
+                                      [display]="true"
+                                      [options]="defaultTooltipOptions">
+                            </textarea>
               <button role="button" class="btn btn-success" (click)="changeTermsAcceptanceInForms()">{{'APPS_WIZARD.TERMS_CONTENT_BUTTON' | translate}}</button>
             </div>
           </div>