diff --git a/src/CraftSharp/Pages/Opening.razor b/src/CraftSharp/Pages/Opening.razor
index 8fdf45e..65d2a4c 100644
--- a/src/CraftSharp/Pages/Opening.razor
+++ b/src/CraftSharp/Pages/Opening.razor
@@ -6,7 +6,7 @@
     <Authorized>
         <div class="numberOfKeys">
             <ValueIndicator IconPath="/Images/opening_icon.png" 
-                            Value="@NumberOfKeys">
+                            Value="@AuthStateProvider.GetCurrentUser().NumberOfKeys">
             </ValueIndicator>
         </div>
     </Authorized>
diff --git a/src/CraftSharp/Pages/Opening.razor.cs b/src/CraftSharp/Pages/Opening.razor.cs
index ef5158f..8140806 100644
--- a/src/CraftSharp/Pages/Opening.razor.cs
+++ b/src/CraftSharp/Pages/Opening.razor.cs
@@ -24,7 +24,6 @@ namespace CraftSharp.Pages
         public IDataService DataService { get; set; }
         [Inject]
         public CustomStateProvider AuthStateProvider { get; set; }
-        int NumberOfKeys { get; set; } = 0;
         int CostInKeys { get; set; } = 1;
 
         [Inject]
@@ -38,13 +37,11 @@ namespace CraftSharp.Pages
             totalItem = await DataService.Count();
 
             items = await DataService.List(0, totalItem);
-
-            NumberOfKeys = AuthStateProvider.GetCurrentUser().NumberOfKeys;
         }
 
         bool canOpen()
         {
-            return isChestClosed && NumberOfKeys >= CostInKeys;
+            return isChestClosed && AuthStateProvider.GetCurrentUser().NumberOfKeys >= CostInKeys;
         }
 
         async void selectRandom()
@@ -52,7 +49,7 @@ namespace CraftSharp.Pages
 
             if (canOpen())
             {
-                NumberOfKeys=NumberOfKeys-CostInKeys;
+                AuthStateProvider.GetCurrentUser().NumberOfKeys -= CostInKeys;
                 randomItem = ItemFactory.GetRandomItem(items);
                 if (AuthStateProvider.GetCurrentUser().getSizeInventory() <= 64)
                 {
diff --git a/src/CraftSharp/Pages/Shop.razor b/src/CraftSharp/Pages/Shop.razor
index d8cd0f7..6d060bc 100644
--- a/src/CraftSharp/Pages/Shop.razor
+++ b/src/CraftSharp/Pages/Shop.razor
@@ -6,7 +6,7 @@
     <Authorized>
         <div class="NumberOfEmeralds">
             <ValueIndicator IconPath="/Images/shop_icon.png" 
-                            Value="@NumberOfEmeralds">
+                            Value="@AuthService.GetCurrentUser().numberOfEmeralds">
             </ValueIndicator>
         </div>
     </Authorized>
diff --git a/src/CraftSharp/Pages/Shop.razor.cs b/src/CraftSharp/Pages/Shop.razor.cs
index 0986aa6..11c7cf6 100644
--- a/src/CraftSharp/Pages/Shop.razor.cs
+++ b/src/CraftSharp/Pages/Shop.razor.cs
@@ -15,10 +15,6 @@ namespace CraftSharp.Pages
         [Inject]
         public IStringLocalizer<Shop> Localizer { get; set; }
 
-        [Inject]
-        public IJSRuntime JsRuntime { get; set; }
-        int NumberOfEmeralds { get; set; } = 0;
-
         List<ShopOfferModel> offers = new List<ShopOfferModel>()
         {
             new ShopOfferModel()
@@ -48,7 +44,6 @@ namespace CraftSharp.Pages
         
         protected override async Task OnInitializedAsync()
         {
-            NumberOfEmeralds = AuthService.GetCurrentUser().numberOfEmeralds;
             foreach(ShopOfferModel offer in offers)
             {
                 animation[offer] = "";
@@ -57,9 +52,9 @@ namespace CraftSharp.Pages
 
         private async void buyKeys(ShopOfferModel offer)
         {
-            if (offer.InputAmount <= NumberOfEmeralds)
+            if (offer.InputAmount <= AuthService.GetCurrentUser().numberOfEmeralds)
             {
-                NumberOfEmeralds -= offer.InputAmount;
+                AuthService.GetCurrentUser().numberOfEmeralds -= offer.InputAmount;
                 AuthService.GetCurrentUser().NumberOfKeys += offer.OutputAmount;
             }
             else