diff --git a/RedumpTool/Features/PacksFeature.cs b/RedumpTool/Features/PacksFeature.cs
index 6163ee8..814ac37 100644
--- a/RedumpTool/Features/PacksFeature.cs
+++ b/RedumpTool/Features/PacksFeature.cs
@@ -65,8 +65,7 @@ namespace RedumpTool.Features
                 _client.Timeout = TimeSpan.FromSeconds(timeout.Value);
 
             // Login to Redump, if necessary
-            if (!_client.LoggedIn)
-                _client.Login(username, password).Wait();
+            _client.Login(username, password).Wait();
 
             // Start the processing
             var processingTask = _client.DownloadPacks(outDir, useSubfolders);
diff --git a/RedumpTool/Features/QueryFeature.cs b/RedumpTool/Features/QueryFeature.cs
index 6900fe3..0ee8f02 100644
--- a/RedumpTool/Features/QueryFeature.cs
+++ b/RedumpTool/Features/QueryFeature.cs
@@ -89,8 +89,7 @@ namespace RedumpTool.Features
                 _client.Timeout = TimeSpan.FromSeconds(timeout.Value);
 
             // Login to Redump, if necessary
-            if (!_client.LoggedIn)
-                _client.Login(username, password).Wait();
+            _client.Login(username, password).Wait();
 
             // Start the processing
             Task<List<int>> processingTask;
diff --git a/RedumpTool/Features/SiteFeature.cs b/RedumpTool/Features/SiteFeature.cs
index ccb8990..8dae9ab 100644
--- a/RedumpTool/Features/SiteFeature.cs
+++ b/RedumpTool/Features/SiteFeature.cs
@@ -89,8 +89,7 @@ namespace RedumpTool.Features
                 _client.Timeout = TimeSpan.FromSeconds(timeout.Value);
 
             // Login to Redump, if necessary
-            if (!_client.LoggedIn)
-                _client.Login(username, password).Wait();
+            _client.Login(username, password).Wait();
 
             // Start the processing
             Task<List<int>> processingTask;
diff --git a/RedumpTool/Features/UserFeature.cs b/RedumpTool/Features/UserFeature.cs
index 3d2b14e..626e701 100644
--- a/RedumpTool/Features/UserFeature.cs
+++ b/RedumpTool/Features/UserFeature.cs
@@ -72,8 +72,7 @@ namespace RedumpTool.Features
                 _client.Timeout = TimeSpan.FromSeconds(timeout.Value);
 
             // Login to Redump, if necessary
-            if (!_client.LoggedIn)
-                _client.Login(username, password).Wait();
+            _client.Login(username, password).Wait();
 
             // Start the processing
             Task<List<int>> processingTask;
diff --git a/RedumpTool/Features/WIPFeature.cs b/RedumpTool/Features/WIPFeature.cs
index 2b3ad66..b936f16 100644
--- a/RedumpTool/Features/WIPFeature.cs
+++ b/RedumpTool/Features/WIPFeature.cs
@@ -84,8 +84,7 @@ namespace RedumpTool.Features
                 _client.Timeout = TimeSpan.FromSeconds(timeout.Value);
 
             // Login to Redump, if necessary
-            if (!_client.LoggedIn)
-                _client.Login(username, password).Wait();
+            _client.Login(username, password).Wait();
 
             // Start the processing
             Task<List<int>> processingTask;
diff --git a/SabreTools.RedumpLib/Web/RedumpClient.cs b/SabreTools.RedumpLib/Web/RedumpClient.cs
index 0713897..c45ee04 100644
--- a/SabreTools.RedumpLib/Web/RedumpClient.cs
+++ b/SabreTools.RedumpLib/Web/RedumpClient.cs
@@ -116,6 +116,13 @@ namespace SabreTools.RedumpLib.Web
         /// <returns>True if the user could be logged in, false otherwise, null on error</returns>
         public async Task<bool?> Login(string username, string password)
         {
+            // Check for already logged in
+            if (LoggedIn)
+            {
+                Console.WriteLine("Already logged in!");
+                return true;
+            }
+
             // Credentials verification
             if (!string.IsNullOrEmpty(username) && !string.IsNullOrEmpty(password))
             {