diff --git a/auth/lib/models/code.dart b/auth/lib/models/code.dart
index 5bba391953..cf2d9ffce4 100644
--- a/auth/lib/models/code.dart
+++ b/auth/lib/models/code.dart
@@ -112,21 +112,20 @@ class Code {
     String issuer,
     String secret,
     CodeDisplay? display,
-    int digits,
-    Algorithm? algorithm,
-  ) {
+    int digits, {
+    Algorithm algorithm = Algorithm.sha1,
+  }) {
     final String encodedIssuer = Uri.encodeQueryComponent(issuer);
-    final Algorithm algo = algorithm ?? Algorithm.sha1;
     return Code(
       account,
       issuer,
       digits,
       defaultPeriod,
       secret,
-      algo,
+      algorithm,
       type,
       0,
-      "otpauth://${type.name}/$issuer:$account?algorithm=${algo.name.toUpperCase()}&digits=$digits&issuer=$encodedIssuer&period=30&secret=$secret",
+      "otpauth://${type.name}/$issuer:$account?algorithm=${algorithm.name.toUpperCase()}&digits=$digits&issuer=$encodedIssuer&period=30&secret=$secret",
       display: display ?? CodeDisplay(),
     );
   }
diff --git a/auth/lib/onboarding/view/setup_enter_secret_key_page.dart b/auth/lib/onboarding/view/setup_enter_secret_key_page.dart
index 38aa777a27..5c91a78c2d 100644
--- a/auth/lib/onboarding/view/setup_enter_secret_key_page.dart
+++ b/auth/lib/onboarding/view/setup_enter_secret_key_page.dart
@@ -504,7 +504,7 @@ class _SetupEnterSecretKeyPageState extends State<SetupEnterSecretKeyPage> {
               secret,
               display,
               isStreamCode ? Code.steamDigits : digits!,
-              _algorithm,
+              algorithm: _algorithm,
             )
           : widget.code!.copyWith(
               account: account,
diff --git a/auth/lib/ui/settings/data/import/bitwarden_import.dart b/auth/lib/ui/settings/data/import/bitwarden_import.dart
index c00101cda6..56106df39e 100644
--- a/auth/lib/ui/settings/data/import/bitwarden_import.dart
+++ b/auth/lib/ui/settings/data/import/bitwarden_import.dart
@@ -107,7 +107,6 @@ Future<int?> _processBitwardenExportFile(
           secret,
           null,
           Code.steamDigits,
-          null,
         );
       } else {
         var issuer = item['name'] ?? '';
@@ -119,7 +118,6 @@ Future<int?> _processBitwardenExportFile(
           totp,
           null,
           Code.defaultDigits,
-          null,
         );
       }
       if (folderID != null && folderIdToName.containsKey(folderID)) {