diff --git a/_include/include_diary.php b/_include/include_diary.php
index 7ce1833..cbe374a 100644
--- a/_include/include_diary.php
+++ b/_include/include_diary.php
@@ -81,6 +81,7 @@ order by object_date ASC;
     }
 
     $smarty->assign('news_array',$news_array);
+    $smarty->assign('user',$user);
 
     //$smarty->assign('balance', $balance);
     $smarty->display('user_diary.tpl');
diff --git a/template/templates/user_data_edit.tpl b/template/templates/user_data_edit.tpl
index 7b53f8d..9e4d899 100644
--- a/template/templates/user_data_edit.tpl
+++ b/template/templates/user_data_edit.tpl
@@ -23,7 +23,7 @@
             <div><input type="text" name="uk_last_modified" id="uk_last_modified" value="{$user_data.uk_last_modified}"></div>
         </div>
 
-        <div>
+        <div style="padding-top: 15px; border-top: 1px solid;">
             <label for="uk_balance_expires">Egyenleg lejár:</label>
             <div><input type="checkbox" name="uk_balance_expires" id="uk_balance_expires" value="1" {if 1==$user_data.uk_balance_expires}checked{/if}></div>
         </div>
@@ -33,6 +33,26 @@
             <div><input type="text" name="uk_balance_expire_date" id="uk_balance_expire_date" placeholder="ÉÉÉÉ-HH-NN" value="{$user_data.uk_balance_expire_date}"></div>
         </div>
 
+        <div>
+            <label>Egyenleg:</label>
+            <div style="padding-top: 6px;">{{$user_data.uk_balance|number_format:0:'':' '}} Ft</div>
+        </div>
+
+        <div style="padding-bottom: 15px; border-bottom: 1px solid;">
+            {if $user_data.uk_balance}
+                <label>Lejár:</label>
+                <div style="padding-top: 6px;">
+                    {if $user_data.uk_balance_expire_date}
+                        {{$user_data.uk_balance_expire_date|date_format:"%Y.%m.%d"}}
+                    {elseif $user_data.uk_last_deposit}
+                        {strtotime("+1 month",strtotime($user_data.uk_last_deposit))|date_format:"%Y.%m.%d"}
+                    {else}
+                        Automatikusan
+                    {/if}
+                </div>
+            {/if}
+        </div>
+
         <div>
             <label class="desc" for="uk_password">Jelszó:</label>
             <div><input type="text" name="uk_password" id="uk_password" value="{$user_data.uk_password}"></div>
diff --git a/template/templates/user_diary.tpl b/template/templates/user_diary.tpl
index 733abee..c5e4118 100644
--- a/template/templates/user_diary.tpl
+++ b/template/templates/user_diary.tpl
@@ -5,13 +5,24 @@
         {foreach $actions as $action}
 
                 {if $action@first}
-                    <div style="margin-bottom: 30px;">
+                    <div style="margin-bottom: 15px;">
                         <div class="list_item line_height14 bigger_space actual_balance">
                             <span class="size20 bold">
                                 Aktuális egyenleg: {$action->get_de_balance()|number_format:0:'':' '} Ft
                             </span>
                         </div>
                     </div>
+
+                    {if $user->get_uk_balance_expires()}
+                        <div class="list_item line_height14 bigger_space" style="margin-bottom: 20px;">
+                            {if $user->get_uk_balance_expire_date()}
+                                Az egyenleg lejár: <span class="bold">{{$user->get_uk_balance_expire_date()|date_format:"%Y.%m.%d"}}</span>
+                            {elseif $user->get_uk_last_deposit()}
+                            {else}
+                                <span class="bold">Kérjük, töltse fel egyenlegét!</span>
+                            {/if}
+                        </div>
+                    {/if}
                 {/if}
 
                 {if $action->get_de_training()|is_a:'training'}