diff --git a/_class/class_money_deposit.php b/_class/class_money_deposit.php
index 4d2136e..c4ab908 100644
--- a/_class/class_money_deposit.php
+++ b/_class/class_money_deposit.php
@@ -228,7 +228,7 @@ class money_deposit {
                 $expireDate = date('Y-m-t', strtotime($mod->get_mod_money_income()->get_mi_date()));
             }
             elseif ($lease->get_l_expire_type() == 2) {
-                $expireDate = date("Y-m-d", strtotime("+1 month", strtotime($mod->get_mod_money_income()->get_mi_date())));
+                $expireDate = date("Y-m-t", strtotime("+1 month", strtotime($mod->get_mod_money_income()->get_mi_date())));
             }
             elseif ($lease->get_l_expire_type() == 3) {
                 //egyedi dátum
diff --git a/template/templates/lease_create.tpl b/template/templates/lease_create.tpl
index 36e9a39..f951ddd 100644
--- a/template/templates/lease_create.tpl
+++ b/template/templates/lease_create.tpl
@@ -21,7 +21,7 @@
             </div>
             <div>
                 <input id="r_02" type="radio" name="l_expire_type" value="2">
-                <label class="choice" for="r_02">Befizetés után következő tárgyhónap</label>
+                <label class="choice" for="r_02">Befizetést követő tárgyhónap vége</label>
             </div>
             <div>
                 <input id="r_03" type="radio" name="l_expire_type" value="3">
diff --git a/template/templates/lease_data_edit.tpl b/template/templates/lease_data_edit.tpl
index 5a092c7..9fec678 100644
--- a/template/templates/lease_data_edit.tpl
+++ b/template/templates/lease_data_edit.tpl
@@ -26,7 +26,7 @@
             </div>
             <div>
                 <input id="r_02" type="radio" name="l_expire_type" value="2" {if $lease->get_l_expire_type() == 2}checked{/if}>
-                <label class="choice" for="r_02">Befizetés után következő tárgyhónap</label>
+                <label class="choice" for="r_02">Befizetést követő tárgyhónap vége</label>
             </div>
             <div>
                 <input id="r_03" type="radio" name="l_expire_type" value="3" {if $lease->get_l_expire_type() == 3}checked{/if}>
diff --git a/template/templates/money_deposit_create.tpl b/template/templates/money_deposit_create.tpl
index b4421d8..85fbc53 100644
--- a/template/templates/money_deposit_create.tpl
+++ b/template/templates/money_deposit_create.tpl
@@ -107,9 +107,9 @@
                 else if (pdata['l_expire_type'] == '2') {
                     //var today = new Date();
                     var today = new Date($('#mod_date').val());
-                    var lastDayOfMonth = new Date(today.getFullYear(), today.getMonth()+1);
-                    $('#expire_date').html(lastDayOfMonth.getFullYear() + '-' + ('0' + (lastDayOfMonth.getMonth()+1)).slice(-2) + '-' + ('0' + today.getDate()).slice(-2));
-                    $('#mod_expire_date').val(lastDayOfMonth.getFullYear() + '-' + ('0' + (lastDayOfMonth.getMonth()+1)).slice(-2) + '-' + ('0' + today.getDate()).slice(-2));
+                    var lastDayOfMonth = new Date(today.getFullYear(), today.getMonth()+2, 0);
+                    $('#expire_date').html(lastDayOfMonth.getFullYear() + '-' + ('0' + (lastDayOfMonth.getMonth()+1)).slice(-2) + '-' + ('0' + lastDayOfMonth.getDate()).slice(-2));
+                    $('#mod_expire_date').val(lastDayOfMonth.getFullYear() + '-' + ('0' + (lastDayOfMonth.getMonth()+1)).slice(-2) + '-' + ('0' + lastDayOfMonth.getDate()).slice(-2));
                 }
                 else if (pdata['l_expire_type'] == '3') {
                     $('#expire_date').html(pdata['l_expire_date']);