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 ef82ecc9..340567a1 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
@@ -476,7 +476,7 @@ <h4 class="text-center" style="color: black !important">
                       [type]="getControl('type')"
                       [storageServiceId]="getConfigControl('storageServiceId')"
                       [storagePath]="getConfigControl('storagePath')"
-                      [content]="getServiceDocByServicIdControl('content')"
+                      [content]="getServiceDocByServiceIdControl('content')"
                       [cache]="serviceData ? serviceData.name : ''"
                       class="full-width"></df-script-editor>
                   </ng-container>
diff --git a/src/app/adf-services/df-service-details/df-service-details.component.ts b/src/app/adf-services/df-service-details/df-service-details.component.ts
index 8c8ab29a..84316802 100644
--- a/src/app/adf-services/df-service-details/df-service-details.component.ts
+++ b/src/app/adf-services/df-service-details/df-service-details.component.ts
@@ -225,7 +225,7 @@ export class DfServiceDetailsComponent implements OnInit {
         }
         if (data?.serviceDocByServiceId) {
           data.config.serviceDefinition = data?.serviceDocByServiceId.content;
-          this.getServiceDocByServicIdControl('content').setValue(
+          this.getServiceDocByServiceIdControl('content').setValue(
             data?.serviceDocByServiceId.content
           );
         }
@@ -250,6 +250,9 @@ export class DfServiceDetailsComponent implements OnInit {
           if (data?.serviceDocByServiceId) {
             this.serviceDefinitionType =
               '' + data?.serviceDocByServiceId.format;
+            this.getConfigControl('serviceDefinition').setValue(
+              data.config.content
+            );
           }
           this.serviceForm.controls['type'].disable();
         } else {
@@ -374,7 +377,7 @@ export class DfServiceDetailsComponent implements OnInit {
     return this.serviceForm.get(`config.${name}`) as FormControl;
   }
 
-  getServiceDocByServicIdControl(name: string) {
+  getServiceDocByServiceIdControl(name: string) {
     return this.serviceForm.get(
       `service_doc_by_service_id.${name}`
     ) as FormControl;
@@ -418,9 +421,6 @@ export class DfServiceDetailsComponent implements OnInit {
         this.serviceDefinitionType
       );
       // }
-      if (data.service_doc_by_service_id.content === '') {
-        data.service_doc_by_service_id = null;
-      }
     } else if (this.isScriptService) {
       params = {
         ...params,
diff --git a/src/app/shared/components/df-side-nav/df-side-nav.component.ts b/src/app/shared/components/df-side-nav/df-side-nav.component.ts
index 0ca3d324..2e27db9b 100644
--- a/src/app/shared/components/df-side-nav/df-side-nav.component.ts
+++ b/src/app/shared/components/df-side-nav/df-side-nav.component.ts
@@ -109,13 +109,19 @@ export class DfSideNavComponent implements OnInit {
           if (userData?.isRootAdmin) {
             return of(null);
           }
-          if (userData?.isSysAdmin && !userData.roleId) {
+          if (
+            userData?.isSysAdmin &&
+            (!userData.roleId || !userData?.id || !userData?.role_id)
+          ) {
             return of(null);
           }
-          if (userData?.isSysAdmin && userData.roleId) {
+          if (
+            userData?.isSysAdmin &&
+            (userData.roleId || userData?.id || userData?.role_id)
+          ) {
             return this.userDataService.restrictedAccess$;
           }
-          if (userData?.roleId) {
+          if (userData?.roleId || userData?.id || userData?.role_id) {
             return of([
               'apps',
               'users',
diff --git a/src/app/shared/types/user.ts b/src/app/shared/types/user.ts
index 01c90751..9b65797e 100644
--- a/src/app/shared/types/user.ts
+++ b/src/app/shared/types/user.ts
@@ -79,4 +79,5 @@ export interface UserSession {
   sessionToken: string;
   tokenExpiryDate: Date;
   roleId: number;
+  role_id?: number;
 }