diff --git a/amadeus/settings.py b/amadeus/settings.py
index b18cffe..6878198 100644
--- a/amadeus/settings.py
+++ b/amadeus/settings.py
@@ -94,8 +94,8 @@ DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql',
         'NAME': 'amadeus',
-        'USER': 'postgres',
-        'PASSWORD': 'felipe',
+        'USER': 'amadeus_admin',
+        'PASSWORD': 'amadeus',
         'HOST': '127.0.0.1',
         'PORT': '5432',
     }
diff --git a/courses/forms.py b/courses/forms.py
index e9955c7..041ec02 100644
--- a/courses/forms.py
+++ b/courses/forms.py
@@ -2,6 +2,7 @@ from django import forms
 from django.utils.translation import ugettext_lazy as _
 from .models import Category, Course, Subject, Topic
 
+
 class CategoryForm(forms.ModelForm):
 
 	class Meta:
@@ -17,6 +18,12 @@ class CategoryForm(forms.ModelForm):
 
 class CourseForm(forms.ModelForm):
 
+	# init_register_date = forms.DateField(widget=forms.DateField)
+	# end_register_date = forms.DateField(widget=forms.DateField)
+	# init_date = forms.DateField(widget=forms.DateField)
+	# end_date = forms.DateField(widget=forms.DateField)
+
+
 	class Meta:
 		model = Course
 		fields = ('name', 'objectivies', 'content', 'max_students', 'init_register_date', 'end_register_date',
@@ -45,9 +52,6 @@ class CourseForm(forms.ModelForm):
 			'image': _('Representative image of the course'),
 			'category': _('Category which the course belongs'),
 		}
-		widgets = {
-			'categoy': forms.Select(),
-		}
 
 class SubjectForm(forms.ModelForm):
 
diff --git a/courses/templates/course/create.html b/courses/templates/course/create.html
index 5fe8aca..36ba77b 100644
--- a/courses/templates/course/create.html
+++ b/courses/templates/course/create.html
@@ -19,12 +19,6 @@
 {% endblock %}
 
 {% block content %}
-	<div class="alert alert-info alert-dismissible" role="alert">
-		<button type="button" class="close" data-dismiss="alert" aria-label="Close">
-			<span aria-hidden="true">&times;</span>
-		</button>
-		<p>{% trans 'All fields are required' %}</p>
-	</div>
 
 	<form method="post" action="" enctype="multipart/form-data">
 		{% csrf_token %}
@@ -48,6 +42,7 @@
 				{% endif %}
 			</div>
 		{% endfor %}
+
 		<input type="submit" value="{% trans 'Save' %}" class="btn btn-sm btn-success" />
 	</form>
 	<br clear="all" />
diff --git a/courses/templates/course/datepicker.html b/courses/templates/course/datepicker.html
new file mode 100644
index 0000000..183c265
--- /dev/null
+++ b/courses/templates/course/datepicker.html
@@ -0,0 +1,4 @@
+<div class="input-append date" id="dp2" data-date="12-02-2012" data-date-format="dd-mm-yyyy">
+  <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 a79e497..7b96efb 100644
--- a/courses/views.py
+++ b/courses/views.py
@@ -40,17 +40,20 @@ class CreateView(LoginRequiredMixin, HasRoleMixin, NotificationMixin,generic.edi
 	template_name = 'course/create.html'
 	form_class = CourseForm
 	success_url = reverse_lazy('course:manage')
+
 	def form_valid(self, form):
 		self.object = form.save(commit = False)
 		self.object.slug = slugify(self.object.name)
-		print('Fooooiiii!!')
 		self.object.save()
+		messages.success(self.request, _('Course created successfully!'))
 
 		return super(CreateView, self).form_valid(form)
 
-	def render_to_response(self, context, **response_kwargs):
-		messages.success(self.request, _('Course created successfully!'))
+	def form_invalid(self, form):
+	    print(form)
+	    return self.render_to_response(self.get_context_data(form=form))
 
+	def render_to_responssse(self, context, **response_kwargs):
 		return self.response_class(request=self.request, template=self.get_template_names(), context=context, using=self.template_engine)
 
 class UpdateView(LoginRequiredMixin, HasRoleMixin, generic.UpdateView):
diff --git a/requirements.txt b/requirements.txt
index 4f57c66..49ad06f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,6 @@
 click==6.6
 Django==1.10
+django-autoslug==1.9.3
 django-bootstrap-breadcrumbs==0.8
 django-discover-runner==1.0
 django-role-permissions==1.2.1
@@ -13,4 +14,3 @@ psycopg2==2.6.2
 six==1.10.0
 slugify==0.0.1
 Werkzeug==0.11.11
-wheel==0.24.0
--
libgit2 0.21.2