diff --git a/cookbook/templates/account/login.html b/cookbook/templates/account/login.html
index fee09f1c..2d5be9a2 100644
--- a/cookbook/templates/account/login.html
+++ b/cookbook/templates/account/login.html
@@ -19,7 +19,7 @@
 
     <div class="row">
         <div class="col-sm-12 col-lg-6 col-md-6 offset-lg-3 offset-md-3">
-        <hr>
+            <hr>
             <form class="login" method="POST" action="{% url 'account_login' %}">
                 {% csrf_token %}
                 {{ form | crispy }}
@@ -29,12 +29,16 @@
                 {% endif %}
 
                 <button class="btn btn-success" type="submit">{% trans "Sign In" %}</button>
-                <a class="btn btn-secondary" href="{% url 'account_signup' %}">{% trans "Sign Up" %}</a>
+
+                {% if SIGNUP_ENABLED %}
+                    <a class="btn btn-secondary" href="{% url 'account_signup' %}">{% trans "Sign Up" %}</a>
+                {% endif %}
 
                 {% if EMAIL_ENABLED %}
                     <a class="btn btn-warning float-right d-none d-xl-block d-lg-block"
                        href="{% url 'account_reset_password' %}">{% trans "Reset My Password" %}</a>
-                    <p class="d-xl-none d-lg-none">{% trans 'Lost your password?' %} <a href="{% url 'account_reset_password' %}">{% trans "Reset My Password" %}</a></p>
+                    <p class="d-xl-none d-lg-none">{% trans 'Lost your password?' %} <a
+                            href="{% url 'account_reset_password' %}">{% trans "Reset My Password" %}</a></p>
                 {% endif %}
             </form>
         </div>
@@ -44,7 +48,7 @@
 
     {% if socialaccount_providers %}
         <div class="row" style="margin-top: 2vh">
-           <div class="col-sm-12 col-lg-6 col-md-6 offset-lg-3 offset-md-3">
+            <div class="col-sm-12 col-lg-6 col-md-6 offset-lg-3 offset-md-3">
                 <h5>{% trans "Social Login" %}</h5>
                 <span>{% trans 'You can use any of the following providers to sign in.' %}</span>
 
@@ -62,5 +66,8 @@
         </div>
     {% endif %}
 
+    <script>
+        $('#id_login').focus()
+    </script>
 
 {% endblock %}
\ No newline at end of file
diff --git a/cookbook/templates/account/signup.html b/cookbook/templates/account/signup.html
index 2750af97..baceb2cb 100644
--- a/cookbook/templates/account/signup.html
+++ b/cookbook/templates/account/signup.html
@@ -71,4 +71,8 @@
 
     </div>
 
+
+    <script>
+        $('#id_username').focus()
+    </script>
 {% endblock %}
\ No newline at end of file