diff --git a/History.md b/History.md
index 083ad15..005aad6 100644
--- a/History.md
+++ b/History.md
@@ -1,4 +1,10 @@
 
+1.2.2 / 2015-08-01
+==================
+
+  * Fix: On register the username needs to be treated like in login
+  * Fixed numbering in README
+
 1.2.1 / 2015-07-31
 ==================
 
diff --git a/register.go b/register.go
index edcd198..ed8cd2c 100644
--- a/register.go
+++ b/register.go
@@ -4,6 +4,7 @@ import (
 	"crypto/sha1"
 	"fmt"
 	"net/http"
+	"strings"
 
 	"github.com/flosch/pongo2"
 	"github.com/gorilla/sessions"
@@ -11,7 +12,7 @@ import (
 
 func registerHandler(res http.ResponseWriter, r *http.Request, session *sessions.Session, ctx *pongo2.Context) (*string, error) {
 	var (
-		username       = r.FormValue("username")
+		username       = strings.ToLower(r.FormValue("username"))
 		password       = r.FormValue("password")
 		passwordCheck  = r.FormValue("password_repeat")
 		hashedPassword = fmt.Sprintf("%x", sha1.Sum([]byte(cfg.PasswordSalt+password)))