diff --git a/core/static/user/login.scss b/core/static/user/login.scss
index 8e135413..97814e12 100644
--- a/core/static/user/login.scss
+++ b/core/static/user/login.scss
@@ -37,8 +37,7 @@ body {
       margin: 0;
     }
 
-    >div,
-    >form {
+    form {
       box-sizing: border-box;
       display: flex;
       flex-direction: column;
@@ -52,7 +51,7 @@ body {
       input[type="submit"] {
         width: 100%;
         max-width: 300px;
-        margin: 0;
+        margin-top: 1em;
       }
 
       .errorlist {
@@ -68,6 +67,10 @@ body {
       .captcha {
         box-sizing: border-box;
 
+        fieldset {
+          margin-bottom: unset
+        }
+
         >img {
           width: 70px;
           object-fit: contain;
diff --git a/core/templates/core/login.jinja b/core/templates/core/login.jinja
index 9506ffdd..75a6bbde 100644
--- a/core/templates/core/login.jinja
+++ b/core/templates/core/login.jinja
@@ -35,26 +35,16 @@
 
     {% csrf_token %}
 
-    <div>
-      <label for="{{ form.username.name }}">{{ form.username.label }}</label>
-      {{ form.username }}
-      {{ form.username.errors }}
-    </div>
-
-    <div>
-      <label for="{{ form.password.name }}">{{ form.password.label }}</label>
-      {{ form.password }}
-      {{ form.password.errors }}
-    </div>
+    {{ form }}
 
     <input type="hidden" name="next" value="{{ next }}">
-    <input type="submit" value="{% trans %}Login{% endtrans %}">
+    <input type="submit" class="btn btn-blue" value="{% trans %}Login{% endtrans %}">
 
     <div>
-      <a href="{{ url('core:password_reset') }}">{% trans %}Lost password?{% endtrans %}</a>
+      <a href="{{ url("core:password_reset") }}">{% trans %}Lost password?{% endtrans %}</a>
     </div>
     <div>
-      <a href="{{ url('core:register') }}">{% trans %}Create account{% endtrans %}</a>
+      <a href="{{ url("core:register") }}">{% trans %}Create account{% endtrans %}</a>
     </div>
   </form>
 {% endblock %}
diff --git a/core/templates/core/register.jinja b/core/templates/core/register.jinja
index 71ef7f2c..de97524e 100644
--- a/core/templates/core/register.jinja
+++ b/core/templates/core/register.jinja
@@ -24,11 +24,11 @@
       {% endif %}
     {% endfor %}
     <div class="captcha">{{ form.captcha.as_field_group() }}</div>
-    <fieldset>
+    <div class="form-group">
       {{ form.cgu_approved.errors }}
       {{ form.cgu_approved }}
       {{ form.cgu_approved.label_tag() }}
-    </fieldset>
+    </div>
     <input type="submit" class="btn btn-blue" value="{% trans %}Register{% endtrans %}" />
   </form>
 {% endblock %}