diff --git a/analytics/views.py b/analytics/views.py
index eb440a6..bc19e5b 100644
--- a/analytics/views.py
+++ b/analytics/views.py
@@ -78,11 +78,11 @@ def new_view(request):
                     "$-$yellow" if i._type == 'Ex' or i._type == 'M' else ""))
                 writercsv = csv.writer(csvfile, delimiter=',', quotechar='|')
                 writercsv.writerow(list)
+        return redirect("/analytics/?start=" + start + "&end=" + end)
+
     except FileNotFoundError:
         os.makedirs(MEDIA_ROOT + '/analytics')
-        redirect("/analytics/new/?start=" + start + "&end=" + end)
-
-    return redirect("/analytics/?start=" + start + "&end=" + end)
+        return redirect("/analytics/new/?start=" + start + "&end=" + end)
 
 
 def check_date_validate(start=None, end=None):
diff --git a/templates/analytics.html b/templates/analytics.html
index 6711221..e431c17 100644
--- a/templates/analytics.html
+++ b/templates/analytics.html
@@ -1,11 +1,11 @@
 <h2>Дата создания отчёта {{ date_create }}</h2>
-<button><a href="new">Сгенирировать отчёт</a></button>
+<button><a href="new?start={{ start }}&end={{ end }}">Сгенирировать отчёт</a></button>
 <button style="margin-bottom: 20px"><a href="/media/analytics/s{{ start }}e{{ end }}progress.csv">Скачать отчёт</a></button>
 <form action="">
     <label>от</label>
-    <input name="start" type="date">
+    <input name="start" type="date" value="{{ start }}">
     <label>до</label>
-    <input name="end" type="date">
+    <input name="end" type="date" value="{{ end }}">
     <button type="submit">Подготовить отчёт</button>
 </form>