diff --git a/controllers/login.go b/controllers/login.go
index 79c28e0..0a9e8dd 100644
--- a/controllers/login.go
+++ b/controllers/login.go
@@ -1,6 +1,8 @@
 package controllers
 
 import (
+	"goweb/msg"
+
 	"github.com/labstack/echo/v4"
 )
 
@@ -17,8 +19,7 @@ func (l *Login) Get(c echo.Context) error {
 	return l.RenderPage(c, p)
 }
 
-//func (a *Contact) Post(c echo.Context) error {
-//	msg.Set(c, msg.Success, "Thank you for contacting us!")
-//	msg.Set(c, msg.Info, "We will respond to you shortly.")
-//	return a.Redirect(c, "home")
-//}
+func (l *Login) Post(c echo.Context) error {
+	msg.Set(c, msg.Danger, "Invalid credentials. Please try again.")
+	return l.Get(c)
+}
diff --git a/controllers/register.go b/controllers/register.go
new file mode 100644
index 0000000..05b8552
--- /dev/null
+++ b/controllers/register.go
@@ -0,0 +1,25 @@
+package controllers
+
+import (
+	"goweb/msg"
+
+	"github.com/labstack/echo/v4"
+)
+
+type Register struct {
+	Controller
+}
+
+func (r *Register) Get(c echo.Context) error {
+	p := NewPage(c)
+	p.Layout = "auth"
+	p.Name = "register"
+	p.Title = "Register"
+	p.Data = "This is the login page"
+	return r.RenderPage(c, p)
+}
+
+func (r *Register) Post(c echo.Context) error {
+	msg.Set(c, msg.Danger, "Registration is currently disabled.")
+	return r.Get(c)
+}
diff --git a/router/router.go b/router/router.go
index 559ce9f..8bd08d0 100644
--- a/router/router.go
+++ b/router/router.go
@@ -63,4 +63,9 @@ func navRoutes(e *echo.Echo, ctr controllers.Controller) {
 func userRoutes(e *echo.Echo, ctr controllers.Controller) {
 	login := controllers.Login{Controller: ctr}
 	e.GET("/user/login", login.Get).Name = "login"
+	e.POST("/user/login", login.Post).Name = "login.post"
+
+	register := controllers.Register{Controller: ctr}
+	e.GET("/user/register", register.Get).Name = "register"
+	e.POST("/user/register", register.Post).Name = "register.post"
 }
diff --git a/views/layouts/auth.gohtml b/views/layouts/auth.gohtml
index 3c5d811..02ba55d 100644
--- a/views/layouts/auth.gohtml
+++ b/views/layouts/auth.gohtml
@@ -10,8 +10,11 @@
                 <div class="container">
                     <div class="columns is-centered">
                         <div class="column is-half">
-                            <h1 class="title">Log in</h1>
+                            {{- if .Title}}
+                                <h1 class="title">{{.Title}}</h1>
+                            {{- end}}
                             <div class="box">
+                                {{template "messages" .}}
                                 {{template "content" .}}
                             </div>
                         </div>
diff --git a/views/pages/contact.gohtml b/views/pages/contact.gohtml
index 58c2118..e398271 100644
--- a/views/pages/contact.gohtml
+++ b/views/pages/contact.gohtml
@@ -1,5 +1,5 @@
 {{define "content"}}
-    <form method="POST">
+    <form method="post">
         <div class="field">
             <label class="label">Message</label>
             <div class="control">
diff --git a/views/pages/login.gohtml b/views/pages/login.gohtml
index 408451c..8c321fb 100644
--- a/views/pages/login.gohtml
+++ b/views/pages/login.gohtml
@@ -1,5 +1,5 @@
 {{define "content"}}
-    <form action="" class="">
+    <form method="post">
         <div class="field">
             <label for="" class="label">Email</label>
             <div class="control">
@@ -20,5 +20,7 @@
                 <a href="{{call .Reverse "home"}}" class="button is-light">Cancel</a>
             </p>
         </div>
+        {{template "csrf" .}}
     </form>
+    <div class="content is-small"><a href="{{call .Reverse "register"}}">Create an account</a></div>
 {{end}}
\ No newline at end of file
diff --git a/views/pages/register.gohtml b/views/pages/register.gohtml
new file mode 100644
index 0000000..ef3f10d
--- /dev/null
+++ b/views/pages/register.gohtml
@@ -0,0 +1,25 @@
+{{define "content"}}
+    <form method="post">
+        <div class="field">
+            <label for="" class="label">Email</label>
+            <div class="control">
+                <input type="email" placeholder="e.g. bobsmith@gmail.com" class="input" required>
+            </div>
+        </div>
+        <div class="field">
+            <label for="" class="label">Password</label>
+            <div class="control">
+                <input type="password" placeholder="*******" class="input" required>
+            </div>
+        </div>
+        <div class="field is-grouped">
+            <p class="control">
+                <button class="button is-primary">Register</button>
+            </p>
+            <p class="control">
+                <a href="{{call .Reverse "home"}}" class="button is-light">Cancel</a>
+            </p>
+        </div>
+        {{template "csrf" .}}
+    </form>
+{{end}}
\ No newline at end of file