diff --git a/src/Eve-O-Preview/Configuration/Implementation/ThumbnailConfiguration.cs b/src/Eve-O-Preview/Configuration/Implementation/ThumbnailConfiguration.cs
index 509a4bc..92142b1 100644
--- a/src/Eve-O-Preview/Configuration/Implementation/ThumbnailConfiguration.cs
+++ b/src/Eve-O-Preview/Configuration/Implementation/ThumbnailConfiguration.cs
@@ -78,6 +78,8 @@ namespace EveOPreview.Configuration.Implementation
 			this.EnableActiveClientHighlight = false;
 			this.ActiveClientHighlightColor = Color.GreenYellow;
 			this.ActiveClientHighlightThickness = 3;
+
+			this.LoginThumbnailLocation = new Point(5, 5);
 		}
 
 		[JsonProperty("CycleGroup1ForwardHotkeys")]
@@ -165,6 +167,9 @@ namespace EveOPreview.Configuration.Implementation
 
 		public int ActiveClientHighlightThickness { get; set; }
 
+		[JsonProperty("LoginThumbnailLocation")]
+		public Point LoginThumbnailLocation { get; set; }
+
 		[JsonProperty]
 		private Dictionary<string, Dictionary<string, Point>> PerClientLayout { get; set; }
 		[JsonProperty]
@@ -178,14 +183,6 @@ namespace EveOPreview.Configuration.Implementation
 		[JsonProperty]
 		private List<string> PriorityClients { get; set; }
 
-		public Point GetDefaultThumbnailLocation()
-		{
-			// Returns default thumbnail location
-			// This location can be used for f.e. EVE clients sitting on the login screen
-			// Can be made configurable later (that's why it was moved out here)
-			return new Point(5, 5);
-		}
-
 		public Point GetThumbnailLocation(string currentClient, string activeClient, Point defaultLocation)
 		{
 			Point location;
diff --git a/src/Eve-O-Preview/Configuration/Interface/IThumbnailConfiguration.cs b/src/Eve-O-Preview/Configuration/Interface/IThumbnailConfiguration.cs
index 4efbed1..fa87807 100644
--- a/src/Eve-O-Preview/Configuration/Interface/IThumbnailConfiguration.cs
+++ b/src/Eve-O-Preview/Configuration/Interface/IThumbnailConfiguration.cs
@@ -49,7 +49,8 @@ namespace EveOPreview.Configuration
 		Color ActiveClientHighlightColor { get; set; }
 		int ActiveClientHighlightThickness { get; set; }
 
-		Point GetDefaultThumbnailLocation();
+		Point LoginThumbnailLocation { get; set; }
+
 		Point GetThumbnailLocation(string currentClient, string activeClient, Point defaultLocation);
 		void SetThumbnailLocation(string currentClient, string activeClient, Point location);
 
diff --git a/src/Eve-O-Preview/Properties/AssemblyInfo.cs b/src/Eve-O-Preview/Properties/AssemblyInfo.cs
index 7b5cead..021f56f 100644
--- a/src/Eve-O-Preview/Properties/AssemblyInfo.cs
+++ b/src/Eve-O-Preview/Properties/AssemblyInfo.cs
@@ -12,7 +12,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("04f08f8d-9e98-423b-acdb-4effb31c0d35")]
-[assembly: AssemblyVersion("6.0.0.0")]
-[assembly: AssemblyFileVersion("6.0.0.0")]
+[assembly: AssemblyVersion("6.0.0.2")]
+[assembly: AssemblyFileVersion("6.0.0.2")]
 
 [assembly: CLSCompliant(false)]
\ No newline at end of file
diff --git a/src/Eve-O-Preview/Services/Implementation/ThumbnailManager.cs b/src/Eve-O-Preview/Services/Implementation/ThumbnailManager.cs
index b124a3f..8c087e9 100644
--- a/src/Eve-O-Preview/Services/Implementation/ThumbnailManager.cs
+++ b/src/Eve-O-Preview/Services/Implementation/ThumbnailManager.cs
@@ -217,7 +217,7 @@ namespace EveOPreview.Services
 
 				view.ThumbnailLocation = this.IsManageableThumbnail(view)
 											? this._configuration.GetThumbnailLocation(view.Title, this._activeClient.Title, view.ThumbnailLocation)
-											: this._configuration.GetDefaultThumbnailLocation();
+											: this._configuration.LoginThumbnailLocation;
 
 				this._thumbnailViews.Add(view.Id, view);