diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index 829f781e..3aacb031 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -99,11 +99,8 @@
 	    {% else %}
             <div class="navbar-item">
                 <div class="buttons">
-                    <a href="/register" class="button is-primary">
-                        <strong>Sign up</strong>
-                    </a>
-                    <a href="/login" class="button is-light">
-                        Log in
+                    <a href="/login" class="button is-primary">
+                        Join
                     </a>
                 </div>
             </div>
diff --git a/bookwyrm/templates/login.html b/bookwyrm/templates/login.html
index d9145d3d..4c61495a 100644
--- a/bookwyrm/templates/login.html
+++ b/bookwyrm/templates/login.html
@@ -2,46 +2,86 @@
 {% block content %}
 
 <div class="columns">
-<div class="column">
-    <h2 class="title">About {{ site_settings.name }}</h2>
-    <p class="block">
-        {{ site_settings.instance_description }}
-    </p>
+    <div class="column">
+        <div class="block">
+            {% if site_settings.allow_registration %}
+            <h2 class="title">Create an Account</h2>
 
-    <p class="block">
-        <a href="/about/">More about this site</a>
-    </p>
-
-    <p class="block">
-        <a href="/register" class="button is-link">Create an Account</a>
-    </p>
-</div>
-
-<div class="column">
-    <h2 class="title">Log in</h2>
-
-    <div class="block">
-        <form name="login" method="post" action="/user-login">
-            {% csrf_token %}
-            <div class="field">
-                <label class="label" for="id_username">Username:</label>
-                <div class="control">{{ login_form.username }}</div>
-            </div>
-            <div class="field">
-                <label class="label" for="id_password">Password:</label>
-                <div class="control">{{ login_form.password }}</div>
-            </div>
-            <div class="field is-grouped">
-                <div class="control">
-                    <button class="button is-primary" type="submit">Log in</button>
+            <form name="register" method="post" action="/user-register">
+                {% csrf_token %}
+                <div class="field">
+                    <label class="label" for="id_username_register">Username:</label>
+                    <div class="control">
+                        <input type="text" name="username" maxlength="150" class="input" required="" id="id_username_register">
+                    </div>
                 </div>
-                <div class="control">
-                    <small><a href="/reset-password">Forgot your password?</a></small>
+                <div class="field">
+                    <label class="label" for="id_email_register">Email address:</label>
+                    <div class="control">
+                        <input type="email" name="email" maxlength="254" class="input" id="id_email_register">
+                    </div>
                 </div>
-            </div>
-        </form>
+                <div class="field">
+                    <label class="label" for="id_password_register">Password:</label>
+                    <div class="control">
+                        <input type="password" name="password" maxlength="128" class="input" required="" id="id_password_register">
+                    </div>
+                </div>
+                <div class="field is-grouped">
+                    <div class="control">
+                        <button class="button is-primary" type="submit">Sign Up</button>
+                    </div>
+                </div>
+            </form>
+            {% else %}
+            <h2 class="title">This instance is closed</h2>
+            <p>Contact an administrator to get an invite</p>
+            {% endif %}
+        </div>
+    </div>
+
+    <div class="column">
+        <div class="block">
+            <h2 class="title">Log in</h2>
+            <form name="login" method="post" action="/user-login">
+                {% csrf_token %}
+                <div class="field">
+                    <label class="label" for="id_username">Username:</label>
+                    <div class="control">
+                        {{ login_form.username }}
+                    </div>
+                </div>
+                <div class="field">
+                    <label class="label" for="id_password">Password:</label>
+                    <div class="control">
+                        {{ login_form.password }}
+                    </div>
+                </div>
+                <div class="field is-grouped">
+                    <div class="control">
+                        <button class="button is-primary" type="submit">Log in</button>
+                    </div>
+                    <div class="control">
+                        <small><a href="/reset-password">Forgot your password?</a></small>
+                    </div>
+                </div>
+            </form>
+        </div>
+        <div class="block">
+            <h2 class="title">About {{ site_settings.name }}</h2>
+            <p class="block">
+                {{ site_settings.instance_description }}
+            </p>
+
+            <p class="block">
+                <a href="/about/">More about this site</a>
+            </p>
+
+            <p class="block">
+                <a href="/register" class="button is-link">Create an Account</a>
+            </p>
+        </div>
     </div>
-</div>
 
 </div>
 {% endblock %}
diff --git a/bookwyrm/templates/register.html b/bookwyrm/templates/register.html
deleted file mode 100644
index 10191860..00000000
--- a/bookwyrm/templates/register.html
+++ /dev/null
@@ -1,49 +0,0 @@
-{% extends 'layout.html' %}
-{% block content %}
-
-<div class="columns">
-<div class="column">
-    <h2 class="title">About {{ site_settings.name }}</h2>
-    <p class="block">
-        {{ site_settings.instance_description }}
-    </p>
-
-    <p class="block">
-        <a href="/about/">More about this site</a>
-    </p>
-
-    <p class="block">
-        <a href="/login" class="button is-link">Log In</a>
-    </p>
-</div>
-
-<div class="column">
-    <h2 class="title">Create an Account</h2>
-
-    <div class="block">
-        <form name="register" method="post" action="/user-register">
-            {% csrf_token %}
-            <div class="field">
-                <label class="label" for="id_username">Username:</label>
-                <div class="control">{{ register_form.username }}</div>
-            </div>
-            <div class="field">
-                <label class="label" for="id_email">Email address:</label>
-                <div class="control">{{ register_form.email }}</div>
-            </div>
-            <div class="field">
-                <label class="label" for="id_password">Password:</label>
-                <div class="control">{{ register_form.password }}</div>
-            </div>
-            <div class="field is-grouped">
-                <div class="control">
-                    <button class="button is-primary" type="submit">Sign Up</button>
-                </div>
-            </div>
-        </form>
-    </div>
-</div>
-
-</div>
-{% endblock %}
-
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 626c1bb0..d35ed377 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -38,7 +38,6 @@ urlpatterns = [
 
     # ui views
     re_path(r'^login/?$', views.login_page),
-    re_path(r'^register/?$', views.register_page),
     re_path(r'^about/?$', views.about_page),
     re_path(r'^invite/?$', views.manage_invites),
     re_path(r'^invite/(?P<code>[A-Za-z0-9]+)/?$', views.invite_page),
diff --git a/bookwyrm/views.py b/bookwyrm/views.py
index e619856d..129274fc 100644
--- a/bookwyrm/views.py
+++ b/bookwyrm/views.py
@@ -193,16 +193,6 @@ def login_page(request):
     return TemplateResponse(request, 'login.html', data)
 
 
-def register_page(request):
-    ''' authentication '''
-    # send user to the login page
-    data = {
-        'site_settings': models.SiteSettings.get(),
-        'register_form': forms.RegisterForm(),
-    }
-    return TemplateResponse(request, 'register.html', data)
-
-
 def about_page(request):
     ''' more information about the instance '''
     data = {