diff --git a/src/app/adf-services/df-service-details/df-paywall-modal.html b/src/app/adf-services/df-service-details/df-paywall-modal.html
index d5925f29..27cbc03e 100644
--- a/src/app/adf-services/df-service-details/df-paywall-modal.html
+++ b/src/app/adf-services/df-service-details/df-paywall-modal.html
@@ -1,3 +1,4 @@
+<!-- eslint-disable prettier/prettier -->
 <div class="app-container" style="padding: 12px 20px">
   <h1 mat-dialog-title style="text-align: center">Unlock Service</h1>
   <mat-dialog-content>
@@ -12,8 +13,7 @@ <h4>{{ 'paywall.hostedTrial' | transloco }}</h4>
         <div class="dynamic-width">
           <h4>{{ 'paywall.ossVersion' | transloco }}</h4>
           <p>
-            {{ 'paywall.signup' | transloco
-            }}<a
+            {{ 'paywall.signup' | transloco }}<a
               href="https://genie.dreamfactory.com/?utm_source=platform&utm_medium=paywall&utm_campaign=hosted"
               target="_blank"
               >{{ 'paywall.trial' | transloco }}</a
diff --git a/src/app/adf-services/df-service-details/df-service-details.component.html b/src/app/adf-services/df-service-details/df-service-details.component.html
index f8e8865f..d8e1032a 100644
--- a/src/app/adf-services/df-service-details/df-service-details.component.html
+++ b/src/app/adf-services/df-service-details/df-service-details.component.html
@@ -20,7 +20,13 @@ <h3>
                 " />
             </h3>
             <div>
-              <button mat-button matStepperNext type="button">Next</button>
+              <button
+                mat-button
+                matStepperNext
+                type="button"
+                [disabled]="serviceForm.get('type')?.value === ''">
+                Next
+              </button>
             </div>
           </div>
           <mat-form-field class="dynamic-width" appearance="outline">
@@ -90,7 +96,13 @@ <h4 class="text-center">{{ type.label }}</h4>
             </div>
           </div>
           <div>
-            <button mat-button matStepperNext type="button">Next</button>
+            <button
+              mat-button
+              matStepperNext
+              type="button"
+              [disabled]="serviceForm.get('type')?.value === ''">
+              Next
+            </button>
           </div>
         </div>
       </mat-step>
@@ -158,7 +170,16 @@ <h4 class="text-center">{{ type.label }}</h4>
             >
             <div>
               <button mat-button matStepperPrevious type="button">Back</button>
-              <button mat-button matStepperNext type="button">Next</button>
+              <button
+                mat-button
+                matStepperNext
+                type="button"
+                [disabled]="
+                  serviceForm.get('type')?.value === '' &&
+                  serviceForm.get('description')?.value === ''
+                ">
+                Next
+              </button>
             </div>
             <div></div>
           </div>
diff --git a/src/app/shared/components/df-side-nav/df-side-nav.component.html b/src/app/shared/components/df-side-nav/df-side-nav.component.html
index 43fe0bb6..45f0ed49 100644
--- a/src/app/shared/components/df-side-nav/df-side-nav.component.html
+++ b/src/app/shared/components/df-side-nav/df-side-nav.component.html
@@ -162,4 +162,4 @@ <h1 class="page-header">
       </mat-expansion-panel>
     </ng-template>
   </ng-container>
-</ng-template>
\ No newline at end of file
+</ng-template>