diff --git a/biscuit/core/forms.py b/biscuit/core/forms.py
index 4605dd42cd75a8efca2828a7f69d0248ae9a8b5c..f6334c279c01d91585cf7553de888f35b4dea0fe 100644
--- a/biscuit/core/forms.py
+++ b/biscuit/core/forms.py
@@ -2,8 +2,6 @@ from django import forms
 from django.contrib.auth import get_user_model
 from django.utils.translation import ugettext_lazy as _
 
-from contact_form.forms import ContactForm
-
 from .models import Person, Group
 
 
@@ -75,9 +73,3 @@ class EditGroupForm(forms.ModelForm):
         super().__init__(*args, **kwargs)
         self.fields['members'].queryset = Person.objects.all()
         self.fields['owners'].queryset = Person.objects.all()
-
-
-class SupportContactForm(ContactForm):
-    subject_template_name = 'contact_form/support/subject.txt'
-    template_name = 'contact_form/support/body.txt'
-    
\ No newline at end of file
diff --git a/biscuit/core/menus.py b/biscuit/core/menus.py
index 6e1e616ce4cda9c67d0bbfc1d4ac7f32458f462f..a8914a5a9bf0ee8c27017f9638d90bdd7e3cb501 100644
--- a/biscuit/core/menus.py
+++ b/biscuit/core/menus.py
@@ -75,7 +75,7 @@ MENUS = {
             'submenu': [
                 {
                     'name': _('Get support'),
-                    'url': 'support_contact_form'
+                    'url': 'contact_form'
                 }
             ]
         }
diff --git a/biscuit/core/templates/contact_form/support/contact_form.html b/biscuit/core/templates/contact_form/contact_form.html
similarity index 100%
rename from biscuit/core/templates/contact_form/support/contact_form.html
rename to biscuit/core/templates/contact_form/contact_form.html
diff --git a/biscuit/core/templates/contact_form/support/body.txt b/biscuit/core/templates/contact_form/contact_form.txt
similarity index 100%
rename from biscuit/core/templates/contact_form/support/body.txt
rename to biscuit/core/templates/contact_form/contact_form.txt
diff --git a/biscuit/core/templates/contact_form/sent.html b/biscuit/core/templates/contact_form/contact_form_sent.html
similarity index 100%
rename from biscuit/core/templates/contact_form/sent.html
rename to biscuit/core/templates/contact_form/contact_form_sent.html
diff --git a/biscuit/core/templates/contact_form/support/subject.txt b/biscuit/core/templates/contact_form/contact_form_subject.txt
similarity index 100%
rename from biscuit/core/templates/contact_form/support/subject.txt
rename to biscuit/core/templates/contact_form/contact_form_subject.txt
diff --git a/biscuit/core/urls.py b/biscuit/core/urls.py
index 4bdb15891444a0ccad1ec104aa0641222c224a9d..4e7d3ac62e59d2a66cba3f39a3ae558fb1c550f0 100644
--- a/biscuit/core/urls.py
+++ b/biscuit/core/urls.py
@@ -3,14 +3,10 @@ from django.conf import settings
 from django.conf.urls.static import static
 from django.contrib import admin
 from django.urls import include, path
-from django.views.generic import TemplateView
-
-from contact_form.views import ContactFormView
 
 import debug_toolbar
 
 from . import views
-from .forms import SupportContactForm
 
 urlpatterns = [
     path('admin/', admin.site.urls),
@@ -30,10 +26,7 @@ urlpatterns = [
     path('group/<int:id_>/edit', views.edit_group, name='edit_group_by_id'),
     path('', views.index, name='index'),
     path('maintenance-mode/', include('maintenance_mode.urls')),
-    path('contact/support/', ContactFormView.as_view(form_class=SupportContactForm),
-        name='support_contact_form'),
-    path('contact/sent/', TemplateView.as_view(template_name='contact_form/sent.html'),
-        name='contact_form_sent'),
+    path('contact/', include('contact_form.urls')),
     path('__i18n__/', include('django.conf.urls.i18n'))
 ]