diff --git a/auth/lib/models/code.dart b/auth/lib/models/code.dart
index ac1c27f6d..6c1d6c53b 100644
--- a/auth/lib/models/code.dart
+++ b/auth/lib/models/code.dart
@@ -1,3 +1,6 @@
+import 'dart:convert';
+
+import 'package:ente_auth/models/code_display.dart';
 import 'package:ente_auth/utils/totp_util.dart';
 import 'package:flutter/foundation.dart';
 
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 a5f30ad2c..c57be617b 100644
--- a/auth/lib/onboarding/view/setup_enter_secret_key_page.dart
+++ b/auth/lib/onboarding/view/setup_enter_secret_key_page.dart
@@ -266,8 +266,8 @@ class _SetupEnterSecretKeyPageState extends State<SetupEnterSecretKeyPage> {
               account,
               issuer,
               secret,
-              isStreamCode ? Code.steamDigits : Code.defaultDigits,
               display,
+              isStreamCode ? Code.steamDigits : Code.defaultDigits,
             )
           : widget.code!.copyWith(
               account: account,
diff --git a/auth/lib/ui/code_widget.dart b/auth/lib/ui/code_widget.dart
index 3beb137fe..e74091758 100644
--- a/auth/lib/ui/code_widget.dart
+++ b/auth/lib/ui/code_widget.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'dart:io';
+import 'dart:ui' as ui;
 
 import 'package:clipboard/clipboard.dart';
 import 'package:ente_auth/core/configuration.dart';
diff --git a/auth/lib/ui/settings/data/import/bitwarden_import.dart b/auth/lib/ui/settings/data/import/bitwarden_import.dart
index 4275abb14..6878fa9f0 100644
--- a/auth/lib/ui/settings/data/import/bitwarden_import.dart
+++ b/auth/lib/ui/settings/data/import/bitwarden_import.dart
@@ -97,6 +97,7 @@ Future<int?> _processBitwardenExportFile(
           issuer,
           totp,
           null,
+          Code.defaultDigits,
         );
       }