diff --git a/src/app/pages/error/error.component.html b/src/app/pages/error/error.component.html
index ece95da..e06a708 100644
--- a/src/app/pages/error/error.component.html
+++ b/src/app/pages/error/error.component.html
@@ -17,6 +17,6 @@
     {{ error }}
   </p>
 
-  <a mat-raised-button color="warn" routerLink="/"><uds-translate>Return</uds-translate></a>
+  <a mat-raised-button color="warn" [routerLink]="returnUrl"><uds-translate>Return</uds-translate></a>
 
 </div>
diff --git a/src/app/pages/error/error.component.ts b/src/app/pages/error/error.component.ts
index 3076de6..70f8262 100644
--- a/src/app/pages/error/error.component.ts
+++ b/src/app/pages/error/error.component.ts
@@ -12,6 +12,7 @@ declare const udsData: any;
 })
 export class ErrorComponent implements OnInit {
   error: string;
+  returnUrl: string;
 
   constructor(public api: UDSApiService, private route: ActivatedRoute) {}
 
@@ -21,6 +22,9 @@ export class ErrorComponent implements OnInit {
 
   getError(): void {
     const id = this.route.snapshot.paramMap.get('id');
+    if (id === '19') {
+      this.returnUrl = '/mfa';
+    }
     this.error = '';
     // Request error string from UDS
     this.api.getErrorInformation(id).subscribe((errInfo) => {
diff --git a/src/app/pages/mfa/mfa.component.html b/src/app/pages/mfa/mfa.component.html
index 5d7e7c5..592e253 100644
--- a/src/app/pages/mfa/mfa.component.html
+++ b/src/app/pages/mfa/mfa.component.html
@@ -1,5 +1,4 @@
 <form id="mfaform" method="post" (ngSubmit)="launch()">
-  <input name="" id="token" value="" type="hidden" />
   <div class="mfa-container">
     <div class="mfa-brand">
       <img [src]="api.staticURL('modern/img/login-img.png')" />
diff --git a/src/app/pages/mfa/mfa.component.ts b/src/app/pages/mfa/mfa.component.ts
index 2cf623d..f0c2839 100644
--- a/src/app/pages/mfa/mfa.component.ts
+++ b/src/app/pages/mfa/mfa.component.ts
@@ -16,9 +16,6 @@ export class MfaComponent implements OnInit {
     // adapt form to post the correct values the correct way
     const form = document.getElementById('mfaform') as HTMLFormElement;
     form.action = this.api.config.urls.mfa;
-    const input = document.getElementById('token') as HTMLInputElement;
-    input.name = this.api.csrfField;
-    input.value = this.api.csrfToken;
 
     if (this.api.errors.length > 0) {
       this.api.gui.alert(