diff --git a/src/app/tools/export.component.html b/src/app/tools/export.component.html
index cc0ff138770..b05ba791d6a 100644
--- a/src/app/tools/export.component.html
+++ b/src/app/tools/export.component.html
@@ -1,4 +1,4 @@
-<form (ngSubmit)="submit()">
+<form (ngSubmit)="submit()" ngNativeValidate>
     <div class="page-header">
         <h1>{{'exportVault' | i18n}}</h1>
     </div>
diff --git a/src/app/tools/import.component.ts b/src/app/tools/import.component.ts
index d89bd293bde..8fecc665473 100644
--- a/src/app/tools/import.component.ts
+++ b/src/app/tools/import.component.ts
@@ -16,6 +16,7 @@ import { FolderRequest } from 'jslib/models/request/folderRequest';
 import { ImportCiphersRequest } from 'jslib/models/request/importCiphersRequest';
 import { KvpRequest } from 'jslib/models/request/kvpRequest';
 
+import { AviraCsvImporter } from 'jslib/importers/aviraCsvImporter';
 import { BitwardenCsvImporter } from 'jslib/importers/bitwardenCsvImporter';
 import { Importer } from 'jslib/importers/importer';
 import { KeePassXCsvImporter } from 'jslib/importers/keepassxCsvImporter';
@@ -66,7 +67,7 @@ export class ImportComponent {
             { id: 'passworddragonxml', name: 'Password Dragon (xml)' },
             { id: 'padlockcsv', name: 'Padlock (csv)' },
             { id: 'clipperzhtml', name: 'Clipperz (html)' },
-            { id: 'avirajson', name: 'Avira (json)' },
+            { id: 'aviracsv', name: 'Avira (csv)' },
             { id: 'saferpasscsv', name: 'SaferPass (csv)' },
             { id: 'upmcsv', name: 'Universal Password Manager (csv)' },
             { id: 'ascendocsv', name: 'Ascendo DataVault (csv)' },
@@ -201,6 +202,8 @@ export class ImportComponent {
                 return new LastPassCsvImporter();
             case 'keepassxcsv':
                 return new KeePassXCsvImporter();
+            case 'aviracsv':
+                return new AviraCsvImporter();
             default:
                 return null;
         }
diff --git a/src/scss/styles.scss b/src/scss/styles.scss
index 15d8fcd0763..cbc84e0ce60 100644
--- a/src/scss/styles.scss
+++ b/src/scss/styles.scss
@@ -173,10 +173,6 @@ label:not(.form-check-label) {
     &:not(:hover) {
         background-color: #ffffff;
     }
-
-    &:disabled {
-        opacity: 1;
-    }
 }
 
 .btn-outline-secondary {
@@ -185,6 +181,10 @@ label:not(.form-check-label) {
     &:hover:not(:disabled) {
         color: $body-color;
     }
+
+    &:disabled {
+        opacity: 1;
+    }
 }
 
 .btn-submit {