diff --git a/poll/templates/poll/create.html b/poll/templates/poll/create.html
index ce58e85..35e2122 100644
--- a/poll/templates/poll/create.html
+++ b/poll/templates/poll/create.html
@@ -91,8 +91,7 @@
               <button type="button" id="add" class="btn btn-primary btn-block btn-sm">add</button>
         <div class="row form-group {% if form.has_error %} has-error {% endif %}">
           <label for="{{ form.limit_date.auto_id }}">{{ form.limit_date.label }}</label>
-          {# {% render_field  form.limit_date class="form-control" form="form"%} #}
-          <input form="form" class="form-control date-picker" type="text" name="{{form.limit_date.name}}" {% if form.limit_date.value != None %}value="{{form.limit_date.value|date:'SHORT_DATE_FORMAT'}}"{% endif %}>
+          <input form="form" class="form-control date-picker" type="text" name="{{form.limit_date.name}}" {% if form.limit_date.value|date:'SHORT_DATE_FORMAT' %}value="{{form.limit_date.value|date:'SHORT_DATE_FORMAT'}}"{% else %} {% if form.limit_date.value != None %}value="{{form.limit_date.value}}"{% endif %}{% endif %}>
           {% if form.limit_date.errors %}
           <div class="not_submited">
           </br>
diff --git a/poll/views.py b/poll/views.py
index 83c0ff5..bfd73d7 100644
--- a/poll/views.py
+++ b/poll/views.py
@@ -236,6 +236,7 @@ class UpdatePoll(LoginRequiredMixin, HasRoleMixin, LogMixin, generic.UpdateView)
 	def get_context_data(self, **kwargs):
 		context = super(UpdatePoll, self).get_context_data(**kwargs)
 		poll = self.object
+		context.get('form').fields.get('students').queryset = poll.topic.subject.students.all()
 		context['topic'] = poll.topic
 		context['course'] = poll.topic.subject.course
 		context['subject'] = poll.topic.subject
--
libgit2 0.21.2