diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/GlobalSettings.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/GlobalSettings.cs
index a75ee7058..b62bb7ba3 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/GlobalSettings.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/GlobalSettings.cs
@@ -43,6 +43,8 @@
 
         public string IdentityEndpoint { get; set; }
 
+        public string LocationEndpoint { get; set; }
+
         public string UserInfoEndpoint { get; set; }
 
         public string LogoutEndpoint { get; set; }
@@ -62,6 +64,7 @@
             LogoutEndpoint = string.Format("{0}:5105/connect/endsession", baseEndpoint);
             IdentityCallback = string.Format("{0}:5105/xamarincallback", baseEndpoint);
             LogoutCallback = string.Format("{0}:5105/Account/Redirecting", baseEndpoint);
+            LocationEndpoint = string.Format("{0}:5109", baseEndpoint);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Helpers/Settings.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Helpers/Settings.cs
index 24da4fd2b..51b1efe30 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Helpers/Settings.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Helpers/Settings.cs
@@ -24,9 +24,13 @@ namespace eShopOnContainers.Core.Helpers
         private const string IdToken = "id_token";
         private const string IdUseMocks = "use_mocks";
         private const string IdUrlBase = "url_base";
+        private const string IdUseFakeLocation = "use_fake_location";
+        private const string IdFakeLatitude = "fake_latitude";
+        private const string IdFakeLongitude = "fake_longitude";
         private static readonly string AccessTokenDefault = string.Empty;
         private static readonly string IdTokenDefault = string.Empty;
 		private static readonly bool UseMocksDefault = true;
+        private static readonly bool UseFakeLocationDefault = false;
         private static readonly string UrlBaseDefault = GlobalSetting.Instance.BaseEndpoint;
 
         #endregion
@@ -78,5 +82,40 @@ namespace eShopOnContainers.Core.Helpers
                 AppSettings.AddOrUpdateValue<string>(IdUrlBase, value);
             }
         }
+
+        public static bool UseFakeLocation
+        {
+            get
+            {
+                return AppSettings.GetValueOrDefault<bool>(IdUseFakeLocation, UseFakeLocationDefault);
+            }
+            set
+            {
+                AppSettings.AddOrUpdateValue<bool>(IdUseFakeLocation, value);
+            }
+        }
+
+        public static double FakeLatitude
+        {
+            get
+            {
+                return AppSettings.GetValueOrDefault<double>(IdFakeLatitude);
+            }
+            set
+            {
+                AppSettings.AddOrUpdateValue<double>(IdFakeLatitude, value);
+            }
+        }
+        public static double FakeLongitude
+        {
+            get
+            {
+                return AppSettings.GetValueOrDefault<double>(IdFakeLongitude);
+            }
+            set
+            {
+                AppSettings.AddOrUpdateValue<double>(IdFakeLongitude, value);
+            }
+        }
     }
 }
\ No newline at end of file