diff --git a/IntentoMTFormOptions.cs b/IntentoMTFormOptions.cs
index 169d373..14e87f1 100644
--- a/IntentoMTFormOptions.cs
+++ b/IntentoMTFormOptions.cs
@@ -301,6 +301,7 @@ public void Fill(IntentoMTFormOptions res)
 			res.TraceEndTime = this.TraceEndTime;
 			res.MemoqAdditional = this.MemoqAdditional;
 			res.SaveLocally = this.SaveLocally;
+			res.Routing = this.Routing;
 			res._authDict = _authDict == null ? null : new Dictionary<string, string>(_authDict);
 		}
 
diff --git a/SmartRoutingState.cs b/SmartRoutingState.cs
index cc10814..5b3be59 100644
--- a/SmartRoutingState.cs
+++ b/SmartRoutingState.cs
@@ -54,7 +54,8 @@ public static string Draw(IntentoTranslationProviderOptionsForm form, SmartRouti
 		public string Draw()
 		{
 			form.formMT.RoutingTable = routingTable;
-			form.formMT.comboBoxRouting.SelectedValue = routing == null ? "best" : routing;
+			if (routing != null)
+				form.formMT.comboBoxRouting.SelectedValue = routing;
 
 			return ProviderState.Draw(form, providerState);
 		}
diff --git a/WinForms/IntentoFormOptonsMain.cs b/WinForms/IntentoFormOptonsMain.cs
index 0f0ab24..a95f874 100644
--- a/WinForms/IntentoFormOptonsMain.cs
+++ b/WinForms/IntentoFormOptonsMain.cs
@@ -141,8 +141,15 @@ Func<string, string, ProxySettings, IntentoAiTextTranslate> fabric
 			currentOptions = originalOptions.Duplicate();
 
 			//smart routing by default
-			if (currentOptions.ApiKey == null && currentOptions.ProviderId == null)
+			if (string.IsNullOrEmpty(currentOptions.ProviderId))
+			{
 				currentOptions.SmartRouting = true;
+				if (string.IsNullOrEmpty(currentOptions.Routing))
+				{
+					currentOptions.Routing = "best";
+					currentOptions.RoutingDisplayName = Resource.BestSmartRouteDescription;
+				}
+			}
 
 			TraceEndTime = originalOptions.TraceEndTime;
 			formAdvanced = new IntentoFormAdvanced(this);