diff --git a/ShareX/TaskSettings.cs b/ShareX/TaskSettings.cs
index 6e79fec96..4e9e00aab 100644
--- a/ShareX/TaskSettings.cs
+++ b/ShareX/TaskSettings.cs
@@ -67,6 +67,7 @@ public string Description
         public FileDestination FileDestination = FileDestination.Dropbox;
         public UrlShortenerType URLShortenerDestination = UrlShortenerType.BITLY;
         public SocialNetworkingService SocialNetworkingServiceDestination = SocialNetworkingService.Twitter;
+
         public bool OverrideFTP = false;
         public int FTPIndex = 0;
 
@@ -111,9 +112,9 @@ public bool IsUsingDefaultSettings
         {
             get
             {
-                return UseDefaultAfterCaptureJob && UseDefaultAfterUploadJob && UseDefaultDestinations && UseDefaultGeneralSettings &&
-                    UseDefaultImageSettings && UseDefaultCaptureSettings && UseDefaultUploadSettings && UseDefaultActions &&
-                    UseDefaultIndexerSettings && UseDefaultAdvancedSettings && !WatchFolderEnabled;
+                return UseDefaultAfterCaptureJob && UseDefaultAfterUploadJob && UseDefaultDestinations && !OverrideFTP && UseDefaultGeneralSettings &&
+                    UseDefaultImageSettings && UseDefaultCaptureSettings && UseDefaultUploadSettings && UseDefaultActions && UseDefaultIndexerSettings &&
+                    UseDefaultAdvancedSettings && !WatchFolderEnabled;
             }
         }
 
diff --git a/ShareX/UploadTask.cs b/ShareX/UploadTask.cs
index c23af9f49..5130d1889 100644
--- a/ShareX/UploadTask.cs
+++ b/ShareX/UploadTask.cs
@@ -837,8 +837,16 @@ public UploadResult UploadFile(Stream stream, string fileName)
                     }
                     break;
                 case FileDestination.FTP:
-                    int index = Info.TaskSettings.OverrideFTP ? Info.TaskSettings.FTPIndex.BetweenOrDefault(0, Program.UploadersConfig.FTPAccountList.Count - 1) :
-                        Program.UploadersConfig.GetFTPIndex(Info.DataType);
+                    int index;
+
+                    if (Info.TaskSettings.OverrideFTP)
+                    {
+                        index = Info.TaskSettings.FTPIndex.BetweenOrDefault(0, Program.UploadersConfig.FTPAccountList.Count - 1);
+                    }
+                    else
+                    {
+                        index = Program.UploadersConfig.GetFTPIndex(Info.DataType);
+                    }
 
                     FTPAccount account = Program.UploadersConfig.FTPAccountList.ReturnIfValidIndex(index);