diff --git a/src/app/admin/add-template/add-template.component.ts b/src/app/admin/add-template/add-template.component.ts
index ff700b5..00deda7 100644
--- a/src/app/admin/add-template/add-template.component.ts
+++ b/src/app/admin/add-template/add-template.component.ts
@@ -64,7 +64,6 @@ export class AddTemplateComponent implements OnInit {
   vcStep: string;
   fromPreview: boolean;
   credTemp: any[];
-  flag: boolean;
   certificateName: any;
   constructor(public schemaService: SchemaService,
     public toastMsg: ToastMessageService,
diff --git a/src/app/admin/configurations/configurations.component.ts b/src/app/admin/configurations/configurations.component.ts
index 72e463d..49343cd 100644
--- a/src/app/admin/configurations/configurations.component.ts
+++ b/src/app/admin/configurations/configurations.component.ts
@@ -75,10 +75,10 @@ export class ConfigurationsComponent implements OnInit {
     if(schemaName == ''){
     this.router.navigateByUrl('/create/' + this.currentTab + '/' + this.usecase + '/' + this.entityKey);
     }
-    // if(schemaName !== ''){
-    //   this.entityKey = schemaName;
-    //   this.router.navigateByUrl('/create/' + this.currentTab + '/' + this.usecase + '/' + this.entityKey);
-    //   }
+    if(schemaName !== ''){
+      this.entityKey = schemaName;
+      this.router.navigateByUrl('/create/' + this.currentTab + '/' + this.usecase + '/' + this.entityKey);
+      }
 
   }
     
@@ -99,4 +99,3 @@ export class ConfigurationsComponent implements OnInit {
     }
   }
   
-