diff --git a/sai/modules/saimod_sys_login/tpl/login.tpl b/sai/modules/saimod_sys_login/tpl/login.tpl
index 208a314..470ae47 100644
--- a/sai/modules/saimod_sys_login/tpl/login.tpl
+++ b/sai/modules/saimod_sys_login/tpl/login.tpl
@@ -10,9 +10,9 @@
                     style="margin-bottom: 15px;"
                     id="bt_login_user"
                     placeholder="${basic_placeholder_username}"
-                    minlength="3" data-validation-minlength-message="${sai_error_username_short}"
-                    maxlength="16" data-validation-maxlength-message="${sai_error_username_long}"
-                    required data-validation-required-message="${sai_error_username_miss}"/>
+                    minlength="3" data-validation-minlength-message="${basic_username_short}"
+                    maxlength="32" data-validation-maxlength-message="${basic_username_long}"
+                    required data-validation-required-message="${basic_username_miss}"/>
         </div>
         <div class="controls">
             <input  type="password"
@@ -20,9 +20,8 @@
                     style="margin-bottom: 15px;"
                     id="bt_login_password"
                     placeholder="${basic_placeholder_password}"
-                    minlength="5" data-validation-minlength-message="${sai_error_password_short}"
-                    maxlength="16" data-validation-maxlength-message="${sai_error_password_long}"
-                    required data-validation-required-message="${sai_error_password_miss}"/>
+                    minlength="5" data-validation-minlength-message="${basic_password_short}"
+                    required data-validation-required-message="${basic_password_miss}"/>
         </div>        
         <div class="help-block"></div>
         <input type="hidden" />
diff --git a/sai/modules/saimod_sys_login/tpl/logout.tpl b/sai/modules/saimod_sys_login/tpl/logout.tpl
index 0524f74..d369b4d 100644
--- a/sai/modules/saimod_sys_login/tpl/logout.tpl
+++ b/sai/modules/saimod_sys_login/tpl/logout.tpl
@@ -19,8 +19,8 @@
                                      size="30"
                                      style="margin-bottom: 15px; float: left;"
                                      id="user_email_input"
-                                     data-validation-email-message="${sai_error_email_wrong}"
-                                     required data-validation-required-message="${sai_error_email_miss}"/>
+                                     data-validation-email-message="${basic_email_wrong}"
+                                     required data-validation-required-message="${basic_email_miss}"/>
                          </div>
                          <div class="help-block" style="float: left; margin-top: 3px;"></div>
                      </div>
@@ -37,8 +37,8 @@
                                       style="margin-bottom: 15px; float: left;"
                                       id="user_old_password"
                                       placeholder="${basic_placeholder_user}"
-                                      minlength="5" data-validation-minlength-message="${sai_error_password_short}"
-                                      required data-validation-required-message="${sai_error_password_miss}"/>
+                                      minlength="5" data-validation-minlength-message="${basic_password_short}"
+                                      required data-validation-required-message="${basic_password_miss}"/>
                               <div id="help-block-old-password" class="help-block" style="float: left; margin-top: 3px;"></div>
                           </div>
                           <div class="control-group controls" style="clear: both">
@@ -48,7 +48,7 @@
                                       id="user_new_password1"
                                       name="user_new_password1"
                                       placeholder="${basic_placeholder_password}"
-                                      minlength="5" data-validation-minlength-message="${sai_error_password_short}"/>
+                                      minlength="5" data-validation-minlength-message="${basic_password_short}"/>
                               <div class="help-block" style="float: left; margin-top: 3px;"></div>
                           </div>
                           <div class="control-group controls" style="clear: both">
@@ -59,7 +59,7 @@
                                       name="user_new_password2"
                                       placeholder="${basic_placeholder_password}"
                                       data-validation-matches-match="user_new_password1"
-                                      data-validation-matches-message="${sai_error_password_match}"/>
+                                      data-validation-matches-message="${basic_password_match}"/>
                               <div class="help-block" style="float: left; margin-top: 3px;"></div>
                           </div>
                      </div>
diff --git a/sai/modules/saimod_sys_login/tpl/register.tpl b/sai/modules/saimod_sys_login/tpl/register.tpl
index 74cbcd9..e7b16fb 100644
--- a/sai/modules/saimod_sys_login/tpl/register.tpl
+++ b/sai/modules/saimod_sys_login/tpl/register.tpl
@@ -15,6 +15,7 @@
                                     id="register_username"
                                     placeholder="${basic_placeholder_username}"
                                     minlength="3" data-validation-minlength-message="${basic_username_short}"
+                                    maxlength="32" data-validation-maxlength-message="${basic_username_long}"
                                     required data-validation-required-message="${basic_username_miss}"/>
                             <br/>
                             <div id="register-help-block-username" class="help-block" style="float: left; margin-top: 3px;"></div>
diff --git a/sai/modules/saistart_sys_sai/tpl/content_loggedout.tpl b/sai/modules/saistart_sys_sai/tpl/content_loggedout.tpl
index 49a4efb..cd4afb3 100644
--- a/sai/modules/saistart_sys_sai/tpl/content_loggedout.tpl
+++ b/sai/modules/saistart_sys_sai/tpl/content_loggedout.tpl
@@ -25,9 +25,9 @@
                                             id="bt_login_user"
                                             class="form-control"
                                             placeholder="${basic_placeholder_username}"
-                                            minlength="3" data-validation-minlength-message="${sai_error_username_short}"
-                                            maxlength="16" data-validation-maxlength-message="${sai_error_username_long}"
-                                            required data-validation-required-message="${sai_error_username_miss}"/>
+                                            minlength="3" data-validation-minlength-message="${basic_username_short}"
+                                            maxlength="32" data-validation-maxlength-message="${basic_username_long}"
+                                            required data-validation-required-message="${basic_username_miss}"/>
                                 </div>
                                 <div class="controls">
                                     <input  type="password"
@@ -36,9 +36,8 @@
                                             id="bt_login_password"
                                             class="form-control"
                                             placeholder="${basic_placeholder_password}"
-                                            minlength="5" data-validation-minlength-message="${sai_error_password_short}"
-                                            maxlength="16" data-validation-maxlength-message="${sai_error_password_long}"
-                                            required data-validation-required-message="${sai_error_password_miss}"/>
+                                            minlength="5" data-validation-minlength-message="${basic_password_short}"
+                                            required data-validation-required-message="${basic_password_miss}"/>
                                 </div>        
                                 <div class="help-block"></div>
                                 <input type="hidden" />
diff --git a/sql/mysql/data/system_text.sql b/sql/mysql/data/system_text.sql
index 832fdb6..6ebd375 100644
--- a/sql/mysql/data/system_text.sql
+++ b/sql/mysql/data/system_text.sql
@@ -448,6 +448,8 @@
     INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_username_long', 'enUS', 'Username is too long', 0, 0, '2015-04-18 13:17:11', '0000-00-00 00:00:00');
     INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_username_long', 'frFR', 'Nom d\'utilisateur trop long!', 3, 3, '2015-04-20 16:26:21', '2015-04-20 16:26:21');
     INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_username_long', 'basic');
+    INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_username_long', 'sai_login');
+    INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_username_long', 'sai_start');
 
     DELETE FROM `system_text` WHERE id = 'basic_username_miss';
     DELETE FROM `system_text_tag` WHERE id = 'basic_username_miss';
@@ -455,6 +457,8 @@
     INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_username_miss', 'enUS', 'Username required', 0, 0, '2015-04-18 13:17:25', '0000-00-00 00:00:00');
     INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_username_miss', 'frFR', 'Nom d\'utilisateur est nécessaire!', 2, 2, '2015-04-21 03:40:34', '2015-04-21 03:40:34');
     INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_username_miss', 'basic');
+    INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_username_miss', 'sai_login');
+    INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_username_miss', 'sai_start');
 
     DELETE FROM `system_text` WHERE id = 'basic_username_short';
     DELETE FROM `system_text_tag` WHERE id = 'basic_username_short';
@@ -462,6 +466,8 @@
     INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_username_short', 'enUS', 'Username is too short', 0, 0, '2015-04-18 13:17:37', '0000-00-00 00:00:00');
     INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_username_short', 'frFR', 'Nom d\'utilisateur trop court!', 2, 2, '2015-04-21 03:39:06', '2015-04-21 03:39:06');
     INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_username_short', 'basic');
+    INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_username_short', 'sai_login');
+    INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_username_short', 'sai_start');
 
     DELETE FROM `system_text` WHERE id = 'basic_users';
     DELETE FROM `system_text_tag` WHERE id = 'basic_users';