diff --git a/lib/components/desktop_login/login_form.dart b/lib/components/desktop_login/login_form.dart
index b9783f87..f2b183f4 100644
--- a/lib/components/desktop_login/login_form.dart
+++ b/lib/components/desktop_login/login_form.dart
@@ -63,7 +63,7 @@ class TokenLoginForm extends HookConsumerWidget {
                         return;
                       }
                       final cookieHeader =
-                          "sp_dc=${directCodeController.text}; sp_key=${keyCodeController.text}";
+                          "sp_dc=${directCodeController.text.trim()}; sp_key=${keyCodeController.text.trim()}";
 
                       authenticationNotifier.setCredentials(
                         await AuthenticationCredentials.fromCookie(
diff --git a/lib/pages/lastfm_login/lastfm_login.dart b/lib/pages/lastfm_login/lastfm_login.dart
index f77d0abb..4280328f 100644
--- a/lib/pages/lastfm_login/lastfm_login.dart
+++ b/lib/pages/lastfm_login/lastfm_login.dart
@@ -108,7 +108,7 @@ class LastFMLoginPage extends HookConsumerWidget {
                                   return;
                                 }
                                 await scrobblerNotifier.login(
-                                  username.text,
+                                  username.text.trim(),
                                   password.text,
                                 );
                                 router.pop();
diff --git a/lib/provider/authentication_provider.dart b/lib/provider/authentication_provider.dart
index f1cf58ec..cd77e7bb 100644
--- a/lib/provider/authentication_provider.dart
+++ b/lib/provider/authentication_provider.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:convert';
 
+import 'package:fl_query/fl_query.dart';
 import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:http/http.dart';
@@ -51,7 +52,8 @@ class AuthenticationCredentials {
         ),
       );
     } catch (e) {
-      if (rootNavigatorKey?.currentContext != null) {
+      if (rootNavigatorKey?.currentContext != null &&
+          await QueryClient.connectivity.isConnected) {
         showPromptDialog(
           context: rootNavigatorKey!.currentContext!,
           title: rootNavigatorKey!.currentContext!.l10n