diff --git a/dependencies b/dependencies
index 7930d97..3a3a7e5 160000
--- a/dependencies
+++ b/dependencies
@@ -1 +1 @@
-Subproject commit 7930d9727019344238297d810661bc3e8f724c37
+Subproject commit 3a3a7e5a6323da5413e3dd8c21abfa7cbe1c3a6f
diff --git a/lib/main.dart b/lib/main.dart
index 0dc258d..ba1eaa8 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -44,15 +44,6 @@ void main() async {
     }
 
     unawaited(performTwonlySafeBackup());
-
-    if (gUser.appVersion < 90) {
-      // BUG: Requested media files for reupload where not reuploaded because the wrong state...
-      await twonlyDB.mediaFilesDao.updateAllRetransmissionUploadingState();
-      await updateUserdata((u) {
-        u.appVersion = 90;
-        return u;
-      });
-    }
   }
 
   globalApplicationCacheDirectory = (await getApplicationCacheDirectory()).path;
@@ -73,6 +64,17 @@ void main() async {
   apiService = ApiService();
   twonlyDB = TwonlyDB();
 
+  if (user != null) {
+    if (gUser.appVersion < 90) {
+      // BUG: Requested media files for reupload where not reuploaded because the wrong state...
+      await twonlyDB.mediaFilesDao.updateAllRetransmissionUploadingState();
+      await updateUserdata((u) {
+        u.appVersion = 90;
+        return u;
+      });
+    }
+  }
+
   await twonlyDB.messagesDao.purgeMessageTable();
   await twonlyDB.receiptsDao.purgeReceivedReceipts();
   unawaited(MediaFileService.purgeTempFolder());
diff --git a/lib/src/localization/generated/app_localizations.dart b/lib/src/localization/generated/app_localizations.dart
index fb8ea1b..7b6c04b 100644
--- a/lib/src/localization/generated/app_localizations.dart
+++ b/lib/src/localization/generated/app_localizations.dart
@@ -667,7 +667,7 @@ abstract class AppLocalizations {
   /// No description provided for @settingsAccount.
   ///
   /// In en, this message translates to:
-  /// **'Konto'**
+  /// **'Account'**
   String get settingsAccount;
 
   /// No description provided for @settingsSubscription.
diff --git a/lib/src/localization/generated/app_localizations_en.dart b/lib/src/localization/generated/app_localizations_en.dart
index fecc2ac..e4d51a4 100644
--- a/lib/src/localization/generated/app_localizations_en.dart
+++ b/lib/src/localization/generated/app_localizations_en.dart
@@ -313,7 +313,7 @@ class AppLocalizationsEn extends AppLocalizations {
   String get settingsProfileEditDisplayNameNew => 'New Displayname';
 
   @override
-  String get settingsAccount => 'Konto';
+  String get settingsAccount => 'Account';
 
   @override
   String get settingsSubscription => 'Subscription';
diff --git a/lib/src/localization/generated/app_localizations_sv.dart b/lib/src/localization/generated/app_localizations_sv.dart
index bcd7c52..05a47b1 100644
--- a/lib/src/localization/generated/app_localizations_sv.dart
+++ b/lib/src/localization/generated/app_localizations_sv.dart
@@ -313,7 +313,7 @@ class AppLocalizationsSv extends AppLocalizations {
   String get settingsProfileEditDisplayNameNew => 'New Displayname';
 
   @override
-  String get settingsAccount => 'Konto';
+  String get settingsAccount => 'Account';
 
   @override
   String get settingsSubscription => 'Subscription';
diff --git a/lib/src/utils/misc.dart b/lib/src/utils/misc.dart
index 031bad0..2db2272 100644
--- a/lib/src/utils/misc.dart
+++ b/lib/src/utils/misc.dart
@@ -159,8 +159,12 @@ Future<bool> authenticateUser(
     }
   } on LocalAuthException catch (e) {
     Log.error(e.toString());
-    if (!force) {
-      return true;
+    if (e.code == LocalAuthExceptionCode.noBiometricHardware ||
+        e.code == LocalAuthExceptionCode.noBiometricsEnrolled ||
+        e.code == LocalAuthExceptionCode.noCredentialsSet) {
+      if (!force) {
+        return true;
+      }
     }
   }
   return false;