diff --git a/abonapp/templates/abonapp/buy_tariff.html b/abonapp/templates/abonapp/buy_tariff.html
index fb2d366..98c01d2 100644
--- a/abonapp/templates/abonapp/buy_tariff.html
+++ b/abonapp/templates/abonapp/buy_tariff.html
@@ -33,7 +33,7 @@
                             <span class="input-group-addon"><span class="glyphicon glyphicon-bullhorn"></span></span>
                             <select class="form-control" name="tariff" id="id_tariffs">
                                 {% for trf in tariffs %}
-                                    {% if trf.pk == selected_tariff %}
+                                    {% if trf == selected_tariff %}
                                         <option value="{{ trf.pk }}" data-deadline='{{ trf.calc_deadline|date:"Y-m-d H:i:s" }}' selected>
                                     {% else %}
                                         <option value="{{ trf.pk }}" data-deadline='{{ trf.calc_deadline|date:"Y-m-d H:i:s" }}'>
@@ -46,7 +46,11 @@
                         {% if not abon.active_tariff %}
                             <div class="input-group">
                                 <span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                                <input type="text" class="form-control" name="deadline" id="id_deadline" value="{{ tariffs.0.calc_deadline|date:'Y-m-d H:i:s' }}">
+                                {% if selected_tariff %}
+                                    <input type="text" class="form-control" name="deadline" id="id_deadline" value="{{ selected_tariff.calc_deadline|date:'Y-m-d H:i:s' }}">
+                                {% else %}
+                                    <input type="text" class="form-control" name="deadline" id="id_deadline" value="{{ tariffs.0.calc_deadline|date:'Y-m-d H:i:s' }}">
+                                {% endif %}
                                 <script type="text/javascript">
                                     $(function () {
                                         $('#id_deadline').datetimepicker({
diff --git a/abonapp/views.py b/abonapp/views.py
index a91a2b7..5862a84 100644
--- a/abonapp/views.py
+++ b/abonapp/views.py
@@ -473,7 +473,7 @@ def pick_tariff(request, gid: int, uname):
         'tariffs': tariffs,
         'abon': abon,
         'group': grp,
-        'selected_tariff': lib.safe_int(request.GET.get('selected_tariff'))
+        'selected_tariff': get_object_or_404(Tariff, pk=request.GET.get('selected_tariff'))
     })