diff --git a/frontend/src/app/generate-token/generate-token.component.html b/frontend/src/app/generate-token/generate-token.component.html
index f972156..adea05a 100644
--- a/frontend/src/app/generate-token/generate-token.component.html
+++ b/frontend/src/app/generate-token/generate-token.component.html
@@ -8,13 +8,13 @@ <h1 class="mb-5 heading">{{ "generate-token.create" | transloco }}</h1>
 </p>
 
 <form #postForm="ngForm" (ngSubmit)="onCreateToken(postForm.value)">
-    <select ngModel name="algo" class="rectangle">
-        <option selected>HS256</option>
-        <option>RS256</option>
+    <select [(ngModel)]="algo" name="algo" class="rectangle">
+        <option>HS256</option>
+        <option [selected]="true">RS256</option>
         <option>ES256</option>
     </select>
 
-    <p  class="font-grey algo">{{"generate-token.data" | transloco}}</p>
+    <p class="font-grey algo">{{"generate-token.data" | transloco}}</p>
 
     <textarea [(ngModel)]="payloadValue" name="payload" class="rectangle-1 data1"></textarea>
 
@@ -32,7 +32,7 @@ <h1 class="mb-5 heading">{{ "generate-token.create" | transloco }}</h1>
 
     <div class="row">
         <div class="col-auto text-end">
-        <button type="submit" (click)="nextStep()" class="btn btn-warning mt-5" innerHTML="{{ 'generate-token.generateToken' | transloco }}"></button>
+        <button type="submit" class="btn btn-warning mt-5" innerHTML="{{ 'generate-token.generateToken' | transloco }}"></button>
         </div>
     </div>
 </form>
\ No newline at end of file
diff --git a/frontend/src/app/generate-token/generate-token.component.ts b/frontend/src/app/generate-token/generate-token.component.ts
index ee427ca..f11f579 100644
--- a/frontend/src/app/generate-token/generate-token.component.ts
+++ b/frontend/src/app/generate-token/generate-token.component.ts
@@ -11,6 +11,7 @@ import { StepService } from '../shared/services/step.service';
 export class GenerateTokenComponent implements OnInit {
 
   payloadValue = '{ "data" : "We raised series A" }'
+  algo ="RS256"
 
   @Input() token = ""
   
@@ -24,10 +25,12 @@ export class GenerateTokenComponent implements OnInit {
   }
 
   onCreateToken(postData: {algo: string, payload: string}){
+      console.log("Creating token for: "+JSON.stringify(postData));
       this.jwtService.post(postData).subscribe({
         next: (success: any)=>{
           this.token = success.token
-          localStorage.setItem('token', this.token)
+          localStorage.setItem('token', this.token);
+          this.nextStep();
         }, error: (error: any) => {
           console.error('error:', error);
         },
@@ -35,7 +38,6 @@ export class GenerateTokenComponent implements OnInit {
   }
 
   nextStep(){
-    this.onCreateToken
     this.stepService.setStep(5)
     this.router.navigate(['generate-token1'])
   }
diff --git a/frontend/src/app/jwtuses/jwtuses.component.html b/frontend/src/app/jwtuses/jwtuses.component.html
index c05a1c5..9505b37 100644
--- a/frontend/src/app/jwtuses/jwtuses.component.html
+++ b/frontend/src/app/jwtuses/jwtuses.component.html
@@ -34,7 +34,8 @@ <h1 class="mb-5 heading">{{ "jwtusedfor.usedFor" | transloco }}</h1>
     <img src="assets/images/icon-crog.svg" class="me-2" />
     {{ "jwtusedfor.leverage3" | transloco }}
     <br>
-    {{"jwtusedfor.leverage4" | transloco}}
+    <!--{{"jwtusedfor.leverage4" | transloco}}-->
+    <!--Include a drawing here to make it easier to understand-->
 </p>
 
 <p class="font-grey">{{"jwtusedfor.introduction3" | transloco}}</p>