diff --git a/notes/templates/login.html b/notes/templates/login.html
index ff8187d..957027f 100644
--- a/notes/templates/login.html
+++ b/notes/templates/login.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <body>
+    <h3>Log In</h3>
     {% if login_failed %}
     <p> Incorrect username or password! </p>
     {% endif %}
@@ -12,5 +13,23 @@
       <input type="password" id="password" name="password"><br><br>
       <input type="submit" value="Log in">
     </form>
+
+    <h3>Register as New User</h3>
+
+    <form action="/accounts/register/" method="POST">
+      {% csrf_token %}
+      <label for="username">Username:</label><br>
+      <input type="text" id="username" name="username"><br><br>
+      <label for="password">Password:</label><br>
+      <input type="password" id="password1" name="password1"><br><br>
+      <label for="password">Repeat Password:</label><br>
+      <input type="password" id="password2" name="password2"><br><br>
+      <ul>
+        {% for error in registration_errors %}
+        <li>{{error}}</li>
+        {% endfor %}
+      </ul>
+      <input type="submit" value="Register">
+    </form>
   </body>
 </html>
diff --git a/notes/urls.py b/notes/urls.py
index ef50308..db10cd6 100644
--- a/notes/urls.py
+++ b/notes/urls.py
@@ -23,5 +23,6 @@ urlpatterns = [
     path('remove/<int:note_id>/', views.remove, name='remove'),
     path('search/', views.search, name='search'),
     path('accounts/login/', views.login_view, name='login'),
+    path('accounts/register/', views.register_view, name='register'),
     path('accounts/logout/', views.logout_view, name='logout'),
 ]
diff --git a/notes/views.py b/notes/views.py
index 6c82a39..767e2f9 100644
--- a/notes/views.py
+++ b/notes/views.py
@@ -1,9 +1,13 @@
+from django.contrib.auth.models import User
 from django.http import HttpResponseRedirect
 from django.contrib.auth.decorators import login_required
+from django.contrib.auth.validators import UnicodeUsernameValidator
 from django.contrib.auth import authenticate, login, logout
+from django.contrib.auth.password_validation import validate_password
 from django.shortcuts import render, redirect
 from django.views.decorators.csrf import csrf_exempt
 from django.db import connection
+from django.core.exceptions import ValidationError
 
 from notes.models import Note
 
@@ -73,6 +77,42 @@ def login_view(request):
     return redirect("index")
 
 
+def register_view(request):
+    if request.method == 'POST':
+        errors = []
+        username = request.POST.get('username')
+        password1 = request.POST.get('password1')
+        password2 = request.POST.get('password2')
+
+        # Username validation
+        if User.objects.filter(username=username).first() != None:
+            errors.append("Username in use.")
+        try:
+            username_validator = UnicodeUsernameValidator()
+            username_validator(username)
+        except ValidationError as error:
+            for message in error.messages:
+                errors.append(message)
+
+        # Password validation
+        if password1 != password2:
+            errors.append("Passwords don't match.")
+        try:
+            validate_password(password1)
+        except ValidationError as error:
+            for message in error.messages:
+                errors.append(message)
+
+        if not errors:
+            user = User.objects.create_user(username=username, password=password1)
+            login(request, user)
+            return redirect("index")
+        else:
+            return render(request, 'login.html', { 'registration_errors' : errors })
+
+    return redirect("index")
+
+
 def logout_view(request):
     if request.method == 'POST':
         logout(request)
