diff --git a/theme/templates/register.html b/theme/templates/register.html
new file mode 100644
index 0000000..876493d
--- /dev/null
+++ b/theme/templates/register.html
@@ -0,0 +1,36 @@
+{%extends "base.html" %}
+
+{% block content %}
+<section class="bg-gray-50 dark:bg-gray-900">
+  <div class="flex flex-col items-center justify-center px-6 py-8 mx-auto md:h-screen lg:py-0">
+      <div class="w-full bg-white rounded-lg shadow dark:border md:mt-0 sm:max-w-md xl:p-0 dark:bg-gray-800 dark:border-gray-700">
+          <div class="p-6 space-y-4 md:space-y-6 sm:p-8">
+              <h1 class="text-xl font-bold leading-tight tracking-tight text-gray-900 md:text-2xl dark:text-white">
+                  Create your account
+              </h1>
+              <form class="space-y-4 md:space-y-6" method="post">
+                  <input type="hidden" name="auth_type" value="form">
+                  {% csrf_token %}
+                  <div>
+                      <label for="username" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Your username</label>
+                      <input type="text" name="username" id="username" class="bg-gray-50 border border-gray-300 text-gray-900 rounded-lg focus:ring-primary-600 focus:border-primary-600 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500" placeholder="fooboar" required="">
+                  </div>
+                  <div>
+                      <label for="email" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Your email</label>
+                      <input type="email" name="email" id="email" class="bg-gray-50 border border-gray-300 text-gray-900 rounded-lg focus:ring-primary-600 focus:border-primary-600 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500" placeholder="foo@bar.it" required="">
+                  </div>
+                  <div>
+                      <label for="password" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Password</label>
+                      <input type="password" name="password" id="password" placeholder="••••••••" class="bg-gray-50 border border-gray-300 text-gray-900 rounded-lg focus:ring-primary-600 focus:border-primary-600 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500" required="">
+                  </div>
+                  <button type="submit" class="w-full inline-flex items-center justify-center p-0.5 me-2 overflow-hidden text-sm font-medium text-gray-900 rounded-lg group bg-gradient-to-br from-purple-600 to-blue-500 group-hover:from-purple-600 group-hover:to-blue-500 hover:text-white dark:text-white focus:ring-4 focus:outline-none focus:ring-blue-300 dark:focus:ring-blue-800">
+                      <span class="w-full px-5 py-2.5 transition-all ease-in duration-75 bg-white dark:bg-gray-900 rounded-md group-hover:bg-opacity-0">
+                          Signup
+                        </span>
+                  </button>
+              </form>
+          </div>
+      </div>
+  </div>
+</section>
+{% endblock content %}
\ No newline at end of file
diff --git a/zitate/forms.py b/zitate/forms.py
index 7313be9..c1776a7 100644
--- a/zitate/forms.py
+++ b/zitate/forms.py
@@ -4,4 +4,10 @@ from django.contrib.auth.models import User
 class LoginForm(forms.Form):
     username = forms.CharField(label="username", max_length=255)
     password = forms.CharField(label="password", max_length=255, widget=forms.PasswordInput)
-    auth_type = forms.CharField(label="auth_type", max_length=255)
\ No newline at end of file
+    auth_type = forms.CharField(label="auth_type", max_length=255)
+
+
+class RegisterForm(forms.Form):
+    username = forms.CharField(label="username", max_length=255)
+    password = forms.CharField(label="password", max_length=255, widget=forms.PasswordInput)
+    email = forms.CharField(label="email", max_length=255)
\ No newline at end of file
diff --git a/zitate/urls.py b/zitate/urls.py
index 08ea24f..281f2ef 100644
--- a/zitate/urls.py
+++ b/zitate/urls.py
@@ -22,6 +22,7 @@ urlpatterns = [
     path('admin/', admin.site.urls),
     path("__reload__/", include("django_browser_reload.urls")),
     path("login", login, name="login"),
+    path("register", register, name="register"),
     path("logout", logout, name="logout"),
     path("settings/", include('settings.urls')),
 ]
diff --git a/zitate/views.py b/zitate/views.py
index 1654740..b4f44b2 100644
--- a/zitate/views.py
+++ b/zitate/views.py
@@ -1,8 +1,9 @@
 from django.shortcuts import render
 import django.contrib.auth as dauth
 from django.shortcuts import redirect
+from django.contrib.auth.models import User
 
-from zitate.forms import LoginForm
+from zitate.forms import LoginForm, RegisterForm
 
 
 def login(request):
@@ -24,6 +25,24 @@ def login(request):
         elif auth_type == "openid":
             return render(request, "login.html")
 
+def register(request):
+    if request.method == "GET":
+        return render(request, "register.html")
+    elif request.method == "POST":
+        form = RegisterForm(request.POST)
+        if form.is_valid():
+            username = form.cleaned_data["username"]
+            password = form.cleaned_data["password"]
+            email = form.cleaned_data["email"]
+            User.objects.create_user(username, email, password)
+            user = dauth.authenticate(request, username=username, password=password)
+            if user is not None:
+                dauth.login(request, user)
+                return redirect("/")
+            else:
+                return render(request, "register.html", {"userError": True})
+
+
 def logout(request):
     dauth.logout(request)
     return redirect("/")
\ No newline at end of file