diff --git a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Browser/Browser.aspx.cs b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Browser/Browser.aspx.cs
index 8e623d16c61..5c2730041df 100644
--- a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Browser/Browser.aspx.cs	
+++ b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Browser/Browser.aspx.cs	
@@ -2494,6 +2494,11 @@ private void UploadFile(HttpPostedFile file, string command)
                                     }
                                 }
                             }
+                            else
+                            {
+                                // fits within configured maximum dimensions
+                                FileManager.Instance.AddFile(currentFolderInfo, fileName, file.InputStream);
+                            }
                         }
                     }
                 }
diff --git a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Browser/FileUploader.ashx.cs b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Browser/FileUploader.ashx.cs
index 5d31e6de79f..cfa562ca58f 100644
--- a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Browser/FileUploader.ashx.cs	
+++ b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Browser/FileUploader.ashx.cs	
@@ -1,187 +1,187 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information
-namespace DNNConnect.CKEditorProvider.Browser
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Drawing;
-    using System.Drawing.Drawing2D;
-    using System.Drawing.Imaging;
-    using System.IO;
-    using System.Linq;
-    using System.Text.RegularExpressions;
-    using System.Web;
-    using System.Web.Script.Serialization;
-
-    using DNNConnect.CKEditorProvider.Constants;
-    using DNNConnect.CKEditorProvider.Objects;
-    using DNNConnect.CKEditorProvider.Utilities;
-    using DotNetNuke.Entities.Portals;
-    using DotNetNuke.Entities.Users;
-    using DotNetNuke.Framework.Providers;
-    using DotNetNuke.Security.Roles;
-    using DotNetNuke.Services.FileSystem;
-
-    /// <summary>
-    /// The File Upload Handler.
-    /// </summary>
-    public class FileUploader : IHttpHandler
-    {
-        /// <summary>
-        /// The JavaScript Serializer.
-        /// </summary>
-        private readonly JavaScriptSerializer js = new JavaScriptSerializer();
-
-        /// <summary>
-        /// Gets a value indicating whether another request can use the <see cref="T:System.Web.IHttpHandler" /> instance.
-        /// </summary>
-        public bool IsReusable
-        {
-            get
-            {
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether [override files].
-        /// </summary>
-        /// <value>
-        ///   <c>true</c> if [override files]; otherwise, <c>false</c>.
-        /// </value>
-        private bool OverrideFiles
-        {
-            get
-            {
-                return HttpContext.Current.Request["overrideFiles"].Equals("1")
-                       || HttpContext.Current.Request["overrideFiles"].Equals(
-                           "true",
-                           StringComparison.InvariantCultureIgnoreCase);
-            }
-        }
-
-        /// <summary>
-        /// Gets the storage folder.
-        /// </summary>
-        /// <value>
-        /// The storage folder.
-        /// </value>
-        private IFolderInfo StorageFolder
-        {
-            get
-            {
-                return FolderManager.Instance.GetFolder(Convert.ToInt32(HttpContext.Current.Request["storageFolderID"]));
-            }
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information
+namespace DNNConnect.CKEditorProvider.Browser
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Drawing;
+    using System.Drawing.Drawing2D;
+    using System.Drawing.Imaging;
+    using System.IO;
+    using System.Linq;
+    using System.Text.RegularExpressions;
+    using System.Web;
+    using System.Web.Script.Serialization;
+
+    using DNNConnect.CKEditorProvider.Constants;
+    using DNNConnect.CKEditorProvider.Objects;
+    using DNNConnect.CKEditorProvider.Utilities;
+    using DotNetNuke.Entities.Portals;
+    using DotNetNuke.Entities.Users;
+    using DotNetNuke.Framework.Providers;
+    using DotNetNuke.Security.Roles;
+    using DotNetNuke.Services.FileSystem;
+
+    /// <summary>
+    /// The File Upload Handler.
+    /// </summary>
+    public class FileUploader : IHttpHandler
+    {
+        /// <summary>
+        /// The JavaScript Serializer.
+        /// </summary>
+        private readonly JavaScriptSerializer js = new JavaScriptSerializer();
+
+        /// <summary>
+        /// Gets a value indicating whether another request can use the <see cref="T:System.Web.IHttpHandler" /> instance.
+        /// </summary>
+        public bool IsReusable
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether [override files].
+        /// </summary>
+        /// <value>
+        ///   <c>true</c> if [override files]; otherwise, <c>false</c>.
+        /// </value>
+        private bool OverrideFiles
+        {
+            get
+            {
+                return HttpContext.Current.Request["overrideFiles"].Equals("1")
+                       || HttpContext.Current.Request["overrideFiles"].Equals(
+                           "true",
+                           StringComparison.InvariantCultureIgnoreCase);
+            }
         }
 
-        /*
-        /// <summary>
-        /// Gets the storage folder.
-        /// </summary>
-        /// <value>
-        /// The storage folder.
-        /// </value>
-        private PortalSettings PortalSettings
-        {
-            get
-            {
-                return new PortalSettings(Convert.ToInt32(HttpContext.Current.Request["portalID"]));
-            }
+        /// <summary>
+        /// Gets the storage folder.
+        /// </summary>
+        /// <value>
+        /// The storage folder.
+        /// </value>
+        private IFolderInfo StorageFolder
+        {
+            get
+            {
+                return FolderManager.Instance.GetFolder(Convert.ToInt32(HttpContext.Current.Request["storageFolderID"]));
+            }
+        }
+
+        /*
+        /// <summary>
+        /// Gets the storage folder.
+        /// </summary>
+        /// <value>
+        /// The storage folder.
+        /// </value>
+        private PortalSettings PortalSettings
+        {
+            get
+            {
+                return new PortalSettings(Convert.ToInt32(HttpContext.Current.Request["portalID"]));
+            }
         }*/
 
-        /// <summary>
-        /// Enables processing of HTTP Web requests by a custom HttpHandler that implements the <see cref="T:System.Web.IHttpHandler" /> interface.
-        /// </summary>
-        /// <param name="context">An <see cref="T:System.Web.HttpContext" /> object that provides references to the intrinsic server objects (for example, Request, Response, Session, and Server) used to service HTTP requests.</param>
-        public void ProcessRequest(HttpContext context)
-        {
-            context.Response.AddHeader("Pragma", "no-cache");
-            context.Response.AddHeader("Cache-Control", "private, no-cache");
-
-            this.HandleMethod(context);
-        }
-
-        /// <summary>
-        /// Returns the options.
-        /// </summary>
-        /// <param name="context">The context.</param>
-        private static void ReturnOptions(HttpContext context)
-        {
-            context.Response.AddHeader("Allow", "DELETE,GET,HEAD,POST,PUT,OPTIONS");
-            context.Response.StatusCode = 200;
+        /// <summary>
+        /// Enables processing of HTTP Web requests by a custom HttpHandler that implements the <see cref="T:System.Web.IHttpHandler" /> interface.
+        /// </summary>
+        /// <param name="context">An <see cref="T:System.Web.HttpContext" /> object that provides references to the intrinsic server objects (for example, Request, Response, Session, and Server) used to service HTTP requests.</param>
+        public void ProcessRequest(HttpContext context)
+        {
+            context.Response.AddHeader("Pragma", "no-cache");
+            context.Response.AddHeader("Cache-Control", "private, no-cache");
+
+            this.HandleMethod(context);
+        }
+
+        /// <summary>
+        /// Returns the options.
+        /// </summary>
+        /// <param name="context">The context.</param>
+        private static void ReturnOptions(HttpContext context)
+        {
+            context.Response.AddHeader("Allow", "DELETE,GET,HEAD,POST,PUT,OPTIONS");
+            context.Response.StatusCode = 200;
         }
 
-        /// <summary>
-        /// Handle request based on method.
-        /// </summary>
-        /// <param name="context">The context.</param>
-        private void HandleMethod(HttpContext context)
-        {
-            switch (context.Request.HttpMethod)
-            {
-                case "HEAD":
-                case "GET":
-                    /*if (GivenFilename(context))
-                    {
-                        this.DeliverFile(context);
-                    }
-                    else
-                    {
-                        ListCurrentFiles(context);
-                    }*/
-
-                    break;
-
-                case "POST":
-                case "PUT":
-                    this.UploadFile(context);
-                    break;
-
-                case "OPTIONS":
-                    ReturnOptions(context);
-                    break;
-
-                default:
-                    context.Response.ClearHeaders();
-                    context.Response.StatusCode = 405;
-                    break;
-            }
+        /// <summary>
+        /// Handle request based on method.
+        /// </summary>
+        /// <param name="context">The context.</param>
+        private void HandleMethod(HttpContext context)
+        {
+            switch (context.Request.HttpMethod)
+            {
+                case "HEAD":
+                case "GET":
+                    /*if (GivenFilename(context))
+                    {
+                        this.DeliverFile(context);
+                    }
+                    else
+                    {
+                        ListCurrentFiles(context);
+                    }*/
+
+                    break;
+
+                case "POST":
+                case "PUT":
+                    this.UploadFile(context);
+                    break;
+
+                case "OPTIONS":
+                    ReturnOptions(context);
+                    break;
+
+                default:
+                    context.Response.ClearHeaders();
+                    context.Response.StatusCode = 405;
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Uploads the file.
+        /// </summary>
+        /// <param name="context">The context.</param>
+        private void UploadFile(HttpContext context)
+        {
+            var statuses = new List<FilesUploadStatus>();
+
+            this.UploadWholeFile(context, statuses);
+
+            this.WriteJsonIframeSafe(context, statuses);
+        }
+
+        /// <summary>
+        /// The get encoder.
+        /// </summary>
+        /// <param name="format">
+        /// The format.
+        /// </param>
+        /// <returns>
+        /// The Encoder.
+        /// </returns>
+        private static ImageCodecInfo GetEncoder(ImageFormat format)
+        {
+            ImageCodecInfo[] codecs = ImageCodecInfo.GetImageDecoders();
+
+            return codecs.FirstOrDefault(codec => codec.FormatID == format.Guid);
         }
 
-        /// <summary>
-        /// Uploads the file.
-        /// </summary>
-        /// <param name="context">The context.</param>
-        private void UploadFile(HttpContext context)
-        {
-            var statuses = new List<FilesUploadStatus>();
-
-            this.UploadWholeFile(context, statuses);
-
-            this.WriteJsonIframeSafe(context, statuses);
-        }
-
-        /// <summary>
-        /// The get encoder.
-        /// </summary>
-        /// <param name="format">
-        /// The format.
-        /// </param>
-        /// <returns>
-        /// The Encoder.
-        /// </returns>
-        private static ImageCodecInfo GetEncoder(ImageFormat format)
-        {
-            ImageCodecInfo[] codecs = ImageCodecInfo.GetImageDecoders();
-
-            return codecs.FirstOrDefault(codec => codec.FormatID == format.Guid);
-        }
-
         private PortalSettings portalSettings = null;
 
-        private EditorProviderSettings GetCurrentSettings(HttpContext context)
-        {
+        private EditorProviderSettings GetCurrentSettings(HttpContext context)
+        {
             var currentSettings = new EditorProviderSettings();
             var request = context.Request;
             int portalId;
@@ -243,75 +243,75 @@ private EditorProviderSettings GetCurrentSettings(HttpContext context)
                     break;
             }
 
-            return currentSettings;
+            return currentSettings;
         }
 
-        /// <summary>
-        /// Uploads the whole file.
-        /// </summary>
-        /// <param name="context">The context.</param>
-        /// <param name="statuses">The statuses.</param>
-        private void UploadWholeFile(HttpContext context, List<FilesUploadStatus> statuses)
-        {
-            for (int i = 0; i < context.Request.Files.Count; i++)
-            {
-                var file = context.Request.Files[i];
-
-                var fileName = Path.GetFileName(file.FileName);
-
-                if (!string.IsNullOrEmpty(fileName))
-                {
-                    // Replace dots in the name with underscores (only one dot can be there... security issue).
-                    fileName = Regex.Replace(fileName, @"\.(?![^.]*$)", "_", RegexOptions.None);
-
-                    // Check for Illegal Chars
-                    if (Utility.ValidateFileName(fileName))
-                    {
-                        fileName = Utility.CleanFileName(fileName);
-                    }
-
-                    // Convert Unicode Chars
-                    fileName = Utility.ConvertUnicodeChars(fileName);
-                }
-                else
-                {
-                    throw new HttpRequestValidationException("File does not have a name");
-                }
-
-                if (fileName.Length > 220)
-                {
-                    fileName = fileName.Substring(fileName.Length - 220);
-                }
-
-                var fileNameNoExtenstion = Path.GetFileNameWithoutExtension(fileName);
-
-                // Rename File if Exists
-                if (!this.OverrideFiles)
-                {
-                    var counter = 0;
-
-                    while (File.Exists(Path.Combine(this.StorageFolder.PhysicalPath, fileName)))
-                    {
-                        counter++;
-                        fileName = string.Format(
-                            "{0}_{1}{2}",
-                            fileNameNoExtenstion,
-                            counter,
-                            Path.GetExtension(file.FileName));
-                    }
-                }
-
-                var contentType = FileContentTypeManager.Instance.GetContentType(Path.GetExtension(fileName));
-                var userId = UserController.Instance.GetCurrentUserInfo().UserID;
-
-                if (!contentType.StartsWith("image", StringComparison.InvariantCultureIgnoreCase))
-                {
-                    FileManager.Instance.AddFile(this.StorageFolder, fileName, file.InputStream, this.OverrideFiles, true, contentType, userId);
-                }
-                else
-                {
-                    // it's an image, so we might need to resize
-                    var currentSettings = this.GetCurrentSettings(context);
+        /// <summary>
+        /// Uploads the whole file.
+        /// </summary>
+        /// <param name="context">The context.</param>
+        /// <param name="statuses">The statuses.</param>
+        private void UploadWholeFile(HttpContext context, List<FilesUploadStatus> statuses)
+        {
+            for (int i = 0; i < context.Request.Files.Count; i++)
+            {
+                var file = context.Request.Files[i];
+
+                var fileName = Path.GetFileName(file.FileName);
+
+                if (!string.IsNullOrEmpty(fileName))
+                {
+                    // Replace dots in the name with underscores (only one dot can be there... security issue).
+                    fileName = Regex.Replace(fileName, @"\.(?![^.]*$)", "_", RegexOptions.None);
+
+                    // Check for Illegal Chars
+                    if (Utility.ValidateFileName(fileName))
+                    {
+                        fileName = Utility.CleanFileName(fileName);
+                    }
+
+                    // Convert Unicode Chars
+                    fileName = Utility.ConvertUnicodeChars(fileName);
+                }
+                else
+                {
+                    throw new HttpRequestValidationException("File does not have a name");
+                }
+
+                if (fileName.Length > 220)
+                {
+                    fileName = fileName.Substring(fileName.Length - 220);
+                }
+
+                var fileNameNoExtenstion = Path.GetFileNameWithoutExtension(fileName);
+
+                // Rename File if Exists
+                if (!this.OverrideFiles)
+                {
+                    var counter = 0;
+
+                    while (File.Exists(Path.Combine(this.StorageFolder.PhysicalPath, fileName)))
+                    {
+                        counter++;
+                        fileName = string.Format(
+                            "{0}_{1}{2}",
+                            fileNameNoExtenstion,
+                            counter,
+                            Path.GetExtension(file.FileName));
+                    }
+                }
+
+                var contentType = FileContentTypeManager.Instance.GetContentType(Path.GetExtension(fileName));
+                var userId = UserController.Instance.GetCurrentUserInfo().UserID;
+
+                if (!contentType.StartsWith("image", StringComparison.InvariantCultureIgnoreCase))
+                {
+                    FileManager.Instance.AddFile(this.StorageFolder, fileName, file.InputStream, this.OverrideFiles, true, contentType, userId);
+                }
+                else
+                {
+                    // it's an image, so we might need to resize
+                    var currentSettings = this.GetCurrentSettings(context);
 
                     int maxWidth = currentSettings.ResizeWidthUpload;
                     int maxHeight = currentSettings.ResizeHeightUpload;
@@ -385,36 +385,41 @@ private void UploadWholeFile(HttpContext context, List<FilesUploadStatus> status
                                     }
                                 }
                             }
+                            else
+                            {
+                                // fits within configured maximum dimensions
+                                FileManager.Instance.AddFile(this.StorageFolder, fileName, file.InputStream);
+                            }
                         }
                     }
                 }
-
-                var fullName = Path.GetFileName(fileName);
-                statuses.Add(new FilesUploadStatus(fullName, file.ContentLength));
-            }
-        }
-
-        /// <summary>
-        /// Writes the JSON iFrame safe.
-        /// </summary>
-        /// <param name="context">The context.</param>
-        /// <param name="statuses">The statuses.</param>
-        private void WriteJsonIframeSafe(HttpContext context, List<FilesUploadStatus> statuses)
-        {
-            context.Response.AddHeader("Vary", "Accept");
-            try
-            {
-                context.Response.ContentType = context.Request["HTTP_ACCEPT"].Contains("application/json")
-                                                   ? "application/json"
-                                                   : "text/plain";
-            }
-            catch
-            {
-                context.Response.ContentType = "text/plain";
-            }
-
-            var jsonObj = this.js.Serialize(statuses.ToArray());
-            context.Response.Write(jsonObj);
-        }
-    }
+
+                var fullName = Path.GetFileName(fileName);
+                statuses.Add(new FilesUploadStatus(fullName, file.ContentLength));
+            }
+        }
+
+        /// <summary>
+        /// Writes the JSON iFrame safe.
+        /// </summary>
+        /// <param name="context">The context.</param>
+        /// <param name="statuses">The statuses.</param>
+        private void WriteJsonIframeSafe(HttpContext context, List<FilesUploadStatus> statuses)
+        {
+            context.Response.AddHeader("Vary", "Accept");
+            try
+            {
+                context.Response.ContentType = context.Request["HTTP_ACCEPT"].Contains("application/json")
+                                                   ? "application/json"
+                                                   : "text/plain";
+            }
+            catch
+            {
+                context.Response.ContentType = "text/plain";
+            }
+
+            var jsonObj = this.js.Serialize(statuses.ToArray());
+            context.Response.Write(jsonObj);
+        }
+    }
 }