diff --git a/MatterControlLib/ApplicationView/ApplicationController.cs b/MatterControlLib/ApplicationView/ApplicationController.cs
index f12678bc2..36608645d 100644
--- a/MatterControlLib/ApplicationView/ApplicationController.cs
+++ b/MatterControlLib/ApplicationView/ApplicationController.cs
@@ -563,11 +563,25 @@ namespace MatterHackers.MatterControl
 			printer.Dispose();
 		}
 
-		public static void LaunchBrowser(string targetUri)
+        public static void LaunchBrowser(string targetUri)
 		{
+            string AddQueryPram(string url, string key, string value)
+            {
+                if (url.Contains("?"))
+                {
+                    return url + "&" + key + "=" + value;
+                }
+                else
+                {
+                    return url + "?" + key + "=" + value;
+                }
+            }
+            
 			UiThread.RunOnIdle(() =>
 			{
-				if (!string.IsNullOrEmpty(OemSettings.Instance.AffiliateCode)
+                var affiliateCode = OemSettings.Instance.AffiliateCode;
+
+                if (!string.IsNullOrEmpty(affiliateCode)
 					&& targetUri.Contains("matterhackers.com"))
 				{
 					string internalLink = "";
@@ -578,14 +592,15 @@ namespace MatterHackers.MatterControl
 						targetUri = targetUri.Substring(0, targetUri.Length - internalLink.Length);
 					}
 
-					if (targetUri.Contains("?"))
+					// if the affiliateCode is only numbers, we assume it is a tracking code
+					if (affiliateCode.All(char.IsDigit))
 					{
-						targetUri += $"&aff={OemSettings.Instance.AffiliateCode}";
+                        targetUri = AddQueryPram(targetUri, "aff", affiliateCode);
 					}
-					else
+                    else // it is an RCODE
 					{
-						targetUri += $"?aff={OemSettings.Instance.AffiliateCode}";
-					}
+                        targetUri = AddQueryPram(targetUri, "rcode", affiliateCode);
+                    }
 
 					targetUri += internalLink;
 				}
diff --git a/MatterControlLib/SettingsManagement/OemSettings.cs b/MatterControlLib/SettingsManagement/OemSettings.cs
index 29749806e..c9447aad8 100644
--- a/MatterControlLib/SettingsManagement/OemSettings.cs
+++ b/MatterControlLib/SettingsManagement/OemSettings.cs
@@ -69,7 +69,7 @@ namespace MatterHackers.MatterControl.SettingsManagement
 
         public bool ShowShopButton = true;
 
-        public bool DesignToolsOnly = true;
+        public bool DesignToolsOnly = false;
 
         public bool CheckForUpdatesOnFirstRun = false;