diff --git a/ippisite/ippidb/templates/account/login.html b/ippisite/ippidb/templates/account/login.html
index d44ec4588feab9462af933010fb3163a29e350b6..66f9a9a30c15620f238306d65b74e7e45ac59948 100644
--- a/ippisite/ippidb/templates/account/login.html
+++ b/ippisite/ippidb/templates/account/login.html
@@ -1,4 +1,4 @@
-{% extends "account/base.html" %}
+{% extends "base.html" %}
 {% load crispy_forms_tags %}
 
 {% load i18n %}
@@ -8,9 +8,9 @@
 
 {% block content %}
 
-<div class="d-flex justify-content-center mt-2">
+<div class="d-flex justify-content-center mt-4 mb-4">
 
-    <div class="card">
+    <div class="card rounded-0">
         <div class="card-header">
             <h1>{% trans "Sign In" %}</h1>
         </div>
@@ -45,8 +45,8 @@
               {% if redirect_field_value %}
               <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}" />
               {% endif %}
-              <a class="btn btn-secondary" href="{% url 'account_reset_password' %}">{% trans "Forgot Password?" %}</a>
-              <button class="btn btn-primary" type="submit">{% trans "Sign In" %}</button>
+              <a class="btn btn-secondary mt-0 border-0" href="{% url 'account_reset_password' %}">{% trans "Forgot Password?" %}</a>
+              <button class="btn btn-primary mt-0" type="submit">{% trans "Sign In" %}</button>
             </form>
         </div>
     </div>
diff --git a/ippisite/ippidb/templates/account/signup.html b/ippisite/ippidb/templates/account/signup.html
index 5b10fd00007ba2229a2fe93fd14383dbaa0562e6..0b963f83460730e6672df1c1d06f6dc62d7d926f 100644
--- a/ippisite/ippidb/templates/account/signup.html
+++ b/ippisite/ippidb/templates/account/signup.html
@@ -1,4 +1,4 @@
-{% extends "account/base.html" %}
+{% extends "base.html" %}
 {% load crispy_forms_tags %}
 
 {% load i18n %}
@@ -6,9 +6,9 @@
 {% block head_title %}{% trans "Signup" %}{% endblock %}
 
 {% block content %}
-<div class="inner-wrap mt-2">
-    <div class="col-12">
-    <div class="card">
+<div class="inner-wrap">
+    <div class="col-12 mt-4 mb-4">
+    <div class="card rounded-0">
         <h1 class="card-header">{% trans "Sign Up" %}</h1>
         <div class="card-body">