diff --git a/courses/templates/category/index.html b/courses/templates/category/index.html
index 9188fca..af13e69 100644
--- a/courses/templates/category/index.html
+++ b/courses/templates/category/index.html
@@ -33,7 +33,7 @@
 	    <div class="panel-body">
 	        <ul class="nav nav-pills nav-stacked">
 	            <li><a href="javascript:void(0)">{% trans 'Replicate Course' %}</a></li>
-	            <li><a href="{% url 'course:create' %}">{% trans 'Create Course' %}</a></li>
+	            <li><a href="{% url 'course:creates' %}">{% trans 'Create Course' %}</a></li>
 	            <li><a href="{% url 'course:create_cat' %}">{% trans 'Create Category' %}</a></li>
 	        </ul>
 	    </div>
diff --git a/courses/templates/course/create.html b/courses/templates/course/create.html
index ee4f215..74e70ed 100644
--- a/courses/templates/course/create.html
+++ b/courses/templates/course/create.html
@@ -19,7 +19,7 @@
 							<div class="form-group {% if form.has_error %} has-error {% endif %} is-fileinput">
 								<label for="{{ field.auto_id }}">{{ field.label }}</label>
 								{% if field.auto_id == 'id_init_register_date' or field.auto_id == 'id_end_register_date' or field.auto_id == 'id_init_date' or field.auto_id == 'id_end_date'%}
-									<input type="date" class="form-control"name="{{field.name}}" value="{% if field.value.year %}{{field.value|date:'Y-m-d'}}{% else %}{{field.value}}{% endif %}" min="{{now|date:'Y-m-d'}}">
+									<input type="text" class="form-control date-picker" name="{{field.name}}" value="{{field.value|date:'SHORT_DATE_FORMAT'}}" min="{{now|date:'Y-m-d'}}">
 								{% elif field.auto_id == 'id_image' %}
 									{% render_field field class='form-control' %}
 									<div class="input-group">
diff --git a/courses/templates/subject/create.html b/courses/templates/subject/create.html
index 45163ba..ab07989 100644
--- a/courses/templates/subject/create.html
+++ b/courses/templates/subject/create.html
@@ -11,8 +11,11 @@
         {% for field in form %}
         <div class="form-group {% if field.errors %} has-error{% endif %}">
           <label for="{{ field.auto_id }}" class="control-label label-static"> {{ field.label }}</label>
-
-          {% render_field field class='form-control' placeholder=field.label%}
+          {% if field.auto_id == 'id_init_date' or field.auto_id == 'id_end_date'%}
+              <input type="text" class="form-control date-picker" name="{{field.name}}" value="{{field.value|date:'SHORT_DATE_FORMAT'}}" min="{{now|date:'SHORT_DATE_FORMAT'}}">
+          {% else %}
+              {% render_field field class='form-control' placeholder=field.label%}
+          {% endif %}
           <span class="help-block">{{ field.help_text }}</span>
         </div>
         {% endfor %}
@@ -22,4 +25,12 @@
       </form>
     </div>
   </div>
+
+  <script type="text/javascript">
+    var locale = navigator.language || navigator.userLanguage;
+
+    $('.date-picker').datepicker({
+        language: locale,
+    });
+  </script>
 {% endblock content %}
diff --git a/courses/templates/subject/update.html b/courses/templates/subject/update.html
index 68ed185..4862d0a 100644
--- a/courses/templates/subject/update.html
+++ b/courses/templates/subject/update.html
@@ -12,7 +12,11 @@
         <div class="form-group {% if field.errors %} has-error{% endif %}">
           <label for="{{ field.auto_id }}" class="control-label label-static"> {{ field.label }}</label>
 
-          {% render_field field class='form-control' placeholder=field.label%}
+          {% if field.auto_id == 'id_init_date' or field.auto_id == 'id_end_date'%}
+              <input type="text" class="form-control date-picker" name="{{field.name}}" value="{{field.value|date:'SHORT_DATE_FORMAT'}}" min="{{now|date:'SHORT_DATE_FORMAT'}}">
+          {% else %}
+              {% render_field field class='form-control' placeholder=field.label%}
+          {% endif %}
           <span class="help-block">{{ field.help_text }}</span>
         </div>
         {% endfor %}
@@ -22,4 +26,12 @@
       </form>
     </div>
   </div>
+
+  <script type="text/javascript">
+    var locale = navigator.language || navigator.userLanguage;
+
+    $('.date-picker').datepicker({
+        language: locale,
+    });
+  </script>
 {% endblock content %}
--
libgit2 0.21.2