diff --git a/lib/features/login/domain/usecases/get_credential_interactor.dart b/lib/features/login/domain/usecases/get_credential_interactor.dart
index b2dd3f903b..621c260497 100644
--- a/lib/features/login/domain/usecases/get_credential_interactor.dart
+++ b/lib/features/login/domain/usecases/get_credential_interactor.dart
@@ -19,7 +19,7 @@ class GetCredentialInteractor {
     try {
       final baseUrl = await credentialRepository.getBaseUrl();
       final authenticationInfo = await credentialRepository.getAuthenticationInfoStored();
-      if (isCredentialValid(baseUrl) && authenticationInfo != null) {
+      if (isCredentialValid(baseUrl)) {
         return Right(GetCredentialViewState(
           baseUrl,
           UserName(authenticationInfo.username),
diff --git a/lib/features/sending_queue/domain/model/sending_email.dart b/lib/features/sending_queue/domain/model/sending_email.dart
index ff5ee87e7c..d3009735a5 100644
--- a/lib/features/sending_queue/domain/model/sending_email.dart
+++ b/lib/features/sending_queue/domain/model/sending_email.dart
@@ -1,6 +1,6 @@
 import 'dart:convert';
-import 'package:core/core.dart';
 import 'package:core/domain/extensions/datetime_extension.dart';
+import 'package:core/utils/platform_info.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter_date_range_picker/flutter_date_range_picker.dart';
 import 'package:jmap_dart_client/http/converter/email_id_nullable_converter.dart';