diff --git a/index-rlg.html b/index-rlg.html
index dd2c485..d024076 100644
--- a/index-rlg.html
+++ b/index-rlg.html
@@ -118,7 +118,7 @@
 </div>
 <div class="modal" id="register">
 <div class="formtable">
-<div><div>Name:</div><div><input type="text" name="name" id="regin_name" maxlength="10"></div></div>
+<div><div>Name:</div><div><input type="text" name="name" id="regin_name" maxlength="20"></div></div>
 <div><div>Password:</div><div><input type="password" name="pw" id="regin_pw"></div></div>
 <div><div>E-mail (optional):</div><div><input type="text" name="email" id="regin_email"></div></div>
 <div>
diff --git a/sqlickrypt.c b/sqlickrypt.c
index ab01083..33c6275 100644
--- a/sqlickrypt.c
+++ b/sqlickrypt.c
@@ -118,6 +118,10 @@ int insertuser(char *uname, char *pw, char *email) {
   sqlite3_stmt *qstmt;
   char salt[20];
 
+  if (strlen(uname) > 20) {
+    return 4;
+  }
+
   opendb(&db, &qstmt, checkquery);
   /* Check for existing account in the same transaction with creating it. */
   status = sqlite3_exec(db, "BEGIN;", NULL, NULL, NULL);