diff --git a/sai/modules/saimod_sys_login/tpl/register.tpl b/sai/modules/saimod_sys_login/tpl/register.tpl
index 1b6240d..56a86a5 100644
--- a/sai/modules/saimod_sys_login/tpl/register.tpl
+++ b/sai/modules/saimod_sys_login/tpl/register.tpl
@@ -14,8 +14,8 @@
                                     style="margin-bottom: 15px; float: left;"
                                     id="register_username"
                                     placeholder="${basic_placeholder_username}"
-                                    minlength="3" data-validation-minlength-message="${sai_error_username_short}"
-                                    required data-validation-required-message="${sai_error_username_miss}"/>
+                                    minlength="3" data-validation-minlength-message="${basic_username_short}"
+                                    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>
                         </div>
@@ -30,8 +30,8 @@
                                     style="margin-bottom: 15px; float: left;"
                                     id="register_email"
                                     placeholder="${basic_placeholder_email}"
-                                    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}"/>
                             <br/>
                             <div id="register-help-block-email" class="help-block" style="float: left; margin-top: 3px;"></div>
                         </div>
@@ -48,8 +48,8 @@
                                           id="user_register_password1"
                                           name="user_register_password1"
                                           placeholder="${basic_placeholder_password}"
-                                          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}"/>
                                   <br/>
                                   <div class="help-block" style="float: left; margin-top: 3px;"></div>
                               </div>
@@ -61,7 +61,7 @@
                                           name="user_register_password2"
                                           placeholder="${basic_placeholder_password}"
                                           data-validation-matches-match="user_register_password1"
-                                          data-validation-matches-message="${sai_error_password_match}"/>
+                                          data-validation-matches-message="${basic_password_match}"/>
                                   <br/>
                                   <div class="help-block" style="float: left; margin-top: 3px;"></div>
                               </div>
diff --git a/sql/qt/mysql/data/system_text.sql b/sql/qt/mysql/data/system_text.sql
index 68ec6ba..dedb442 100644
--- a/sql/qt/mysql/data/system_text.sql
+++ b/sql/qt/mysql/data/system_text.sql
@@ -93,6 +93,14 @@
     INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_email_wrong', 'enUS', 'Invalid EMail!', 0, 0, '2015-04-18 13:15:58', '0000-00-00 00:00:00');
     INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_email_wrong', 'frFR', 'Adresse courriel&nbsp;non valide!', 3, 3, '2015-04-20 16:23:48', '2015-04-20 16:23:48');
     INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_email_wrong', 'basic');
+    INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_email_wrong', 'sai_login');
+
+    DELETE FROM `system_text` WHERE id = 'basic_email_miss';
+    DELETE FROM `system_text_tag` WHERE id = 'basic_email_miss';
+    INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_email_miss', 'deDE', 'EMail fehlt!', 0, 2, '2015-04-18 13:15:58', '2015-04-18 13:15:58');
+    INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_email_miss', 'enUS', 'EMail missing!', 0, 0, '2015-04-18 13:15:58', '0000-00-00 00:00:00');
+    INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_email_miss', 'basic');
+    INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_email_miss', 'sai_login');
 
     DELETE FROM `system_text` WHERE id = 'basic_error';
     DELETE FROM `system_text_tag` WHERE id = 'basic_error';
@@ -208,13 +216,13 @@
     INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_password', 'basic');
     INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_password', 'sai_login');
 
-    DELETE FROM `system_text` WHERE id = 'basic_password_long';
-    DELETE FROM `system_text_tag` WHERE id = 'basic_password_long';
-    INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_password_long', 'deDE', 'Passwort zu lang', 0, 2, '2015-04-18 13:16:18', '2015-04-18 13:16:18');
-    INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_password_long', 'enUS', 'Password too long', 0, 0, '2015-04-18 13:16:18', '0000-00-00 00:00:00');
-    INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_password_long', 'frFR', 'Mot de passe trop long!', 3, 3, '2015-04-20 16:28:21', '2015-04-20 16:28:21');
-    INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_password_long', 'basic');
-    INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_password_long', 'sai_login');
+    -- DELETE FROM `system_text` WHERE id = 'basic_password_long';
+    -- DELETE FROM `system_text_tag` WHERE id = 'basic_password_long';
+    -- INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_password_long', 'deDE', 'Passwort zu lang', 0, 2, '2015-04-18 13:16:18', '2015-04-18 13:16:18');
+    -- INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_password_long', 'enUS', 'Password too long', 0, 0, '2015-04-18 13:16:18', '0000-00-00 00:00:00');
+    -- INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_password_long', 'frFR', 'Mot de passe trop long!', 3, 3, '2015-04-20 16:28:21', '2015-04-20 16:28:21');
+    -- INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_password_long', 'basic');
+    -- INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_password_long', 'sai_login');
 
     DELETE FROM `system_text` WHERE id = 'basic_password_match';
     DELETE FROM `system_text_tag` WHERE id = 'basic_password_match';