diff --git a/courses/forms.py b/courses/forms.py
index 6084e1e..4f240e1 100644
--- a/courses/forms.py
+++ b/courses/forms.py
@@ -3,6 +3,7 @@ from django.utils.translation import ugettext_lazy as _
 from .models import CourseCategory, Course, Subject, Topic, ActivityFile, Activity, FileMaterial, LinkMaterial
 from s3direct.widgets import S3DirectWidget
 from django_summernote.widgets import SummernoteWidget
+from amadeus import settings
 
 class CategoryCourseForm(forms.ModelForm):
 
@@ -18,7 +19,13 @@ class CategoryCourseForm(forms.ModelForm):
 
 
 class CourseForm(forms.ModelForm):
+
+	init_date = forms.DateField(input_formats=settings.DATE_INPUT_FORMATS)
+	end_register_date = forms.DateField(input_formats=settings.DATE_INPUT_FORMATS)
+	init_register_date = forms.DateField(input_formats=settings.DATE_INPUT_FORMATS)
+	end_date = forms.DateField(input_formats=settings.DATE_INPUT_FORMATS)
 	def clean_end_register_date(self):
+		
 		init_register_date = self.cleaned_data['init_register_date']
 		end_register_date = self.cleaned_data['end_register_date']
 
@@ -27,6 +34,8 @@ class CourseForm(forms.ModelForm):
 		return end_register_date
 
 	def clean_init_date(self):
+
+		
 		end_register_date = self.cleaned_data['end_register_date']
 		init_date = self.cleaned_data['init_date']
 
@@ -35,6 +44,7 @@ class CourseForm(forms.ModelForm):
 		return init_date
 
 	def clean_end_date(self):
+		print(self.cleaned_data)
 		init_date = self.cleaned_data['init_date']
 		end_date = self.cleaned_data['end_date']
 
@@ -43,15 +53,17 @@ class CourseForm(forms.ModelForm):
 		return end_date
 
 
+
 	class Meta:
 		model = Course
 		fields = ('name', 'objectivies', 'content', 'max_students', 'init_register_date', 'end_register_date',
 					'init_date', 'end_date', 'category', 'coordenator','public')
+		localized_fields = ('init_register_date', 'end_register_date', 'init_date', 'end_date',)
 		labels = {
                             'name': _('Name'),
                             'objectivies': _('Objectives'),
                             'content': _('Content'),
-                            'max_students': _('Number of studets maximum'),
+                            'max_students': _('Number of students maximum'),
                             'init_register_date': _('Course registration start date'),
                             'end_register_date': _('Course registration end date'),
                             'init_date': _('Course start date'),
@@ -119,7 +131,7 @@ class UpdateCourseForm(CourseForm):
                             'name': _('Name'),
                             'objectivies': _('Objectives'),
                             'content': _('Content'),
-                            'max_students': _('Number of studets maximum'),
+                            'max_students': _('Number of students maximum'),
                             'init_register_date': _('Course registration start date'),
                             'end_register_date': _('Course registration end date'),
                             'init_date': _('Course start date'),
diff --git a/courses/templates/course/create.html b/courses/templates/course/create.html
index ca4d38c..856ab12 100644
--- a/courses/templates/course/create.html
+++ b/courses/templates/course/create.html
@@ -20,7 +20,7 @@
 						<label for="{{ field.auto_id }}">{{ field.label }}</label>
 					{% endif %}
 					{% 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="text" class="form-control date-picker" name="{{field.name}}" value="{{field.value|date:'SHORT_DATE_FORMAT'}}" min="{{now|date:'SHORT_DATE_FORMAT'}}">
+						<input type="text" class="form-control date-picker" name="{{field.name}}" value="{{field.value|date}}" min="{{now|date:'SHORT_DATE_FORMAT'}}">
 					{% elif field.auto_id == 'id_public' %}
 						<div class="checkbox">
 							<label>
diff --git a/courses/templates/course/datepicker.html b/courses/templates/course/datepicker.html
index 183c265..2bbaf99 100644
--- a/courses/templates/course/datepicker.html
+++ b/courses/templates/course/datepicker.html
@@ -1,4 +1,4 @@
-<div class="input-append date" id="dp2" data-date="12-02-2012" data-date-format="dd-mm-yyyy">
+<div class="input-append date" id="dp2" data-date="12-02-2012" >
   <input class="span2" size="16" type="text">
   <span class="add-on"><i class="icon-th"></i></span>
 </div>
\ No newline at end of file
diff --git a/courses/views.py b/courses/views.py
index 35143b7..c83defa 100644
--- a/courses/views.py
+++ b/courses/views.py
@@ -155,7 +155,6 @@ class CreateCourseView(LoginRequiredMixin, HasRoleMixin, LogMixin, NotificationM
     def form_valid(self, form):
         self.object = form.save()
         self.object.professors.add(self.request.user)
-
         self.log_context['course_id'] = self.object.id
         self.log_context['course_name'] = self.object.name
         self.log_context['course_slug'] = self.object.slug
--
libgit2 0.21.2