diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/GlobalSettings.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/GlobalSettings.cs
index 46d08ebb7..3bb1630ea 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/GlobalSettings.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/GlobalSettings.cs
@@ -2,6 +2,9 @@
 {
     public class GlobalSetting
     {
+        public const string AzureTag = "Azure";
+        public const string MockTag = "Mock";
+
         private string _baseEndpoint;
         private static readonly GlobalSetting _instance = new GlobalSetting();
 
@@ -48,7 +51,7 @@
 
         private void UpdateEndpoint(string baseEndpoint)
         {
-            RegisterWebsite = string.Format("{0}/Account/Register", baseEndpoint);
+            RegisterWebsite = string.Format("{0}:5105/Account/Register", baseEndpoint);
             CatalogEndpoint = string.Format("{0}:5101", baseEndpoint);
             OrdersEndpoint = string.Format("{0}:5102", baseEndpoint);
             BasketEndpoint = string.Format("{0}:5103", baseEndpoint);
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/LoginView.xaml.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/LoginView.xaml.cs
index ad41dcf9f..7dd72ced1 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/LoginView.xaml.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/LoginView.xaml.cs
@@ -1,4 +1,5 @@
-using eShopOnContainers.Core.ViewModels;
+using eShopOnContainers.Core.Helpers;
+using eShopOnContainers.Core.ViewModels;
 using System;
 using System.Diagnostics;
 using System.Threading.Tasks;
@@ -17,6 +18,8 @@ namespace eShopOnContainers.Core.Views
 
         protected override async void OnAppearing()
         {
+            GlobalSetting.Instance.BaseEndpoint = Settings.UrlBase;
+
             var content = this.Content;
             this.Content = null;
             this.Content = content;