diff --git a/locale/ubl-settings-repomanager.pot b/locale/ubl-settings-repomanager.pot
index 8fd656b..2fa228b 100644
--- a/locale/ubl-settings-repomanager.pot
+++ b/locale/ubl-settings-repomanager.pot
@@ -170,7 +170,7 @@ msgid "Server type:"
 msgstr ""
 
 #: source/ubl-strings.h:51
-msgid "IP adress:"
+msgid "IP address:"
 msgstr ""
 
 #: source/ubl-strings.h:52
diff --git a/locale/ubl-settings-repomanager_ru.po b/locale/ubl-settings-repomanager_ru.po
index 79ec573..141d3df 100644
--- a/locale/ubl-settings-repomanager_ru.po
+++ b/locale/ubl-settings-repomanager_ru.po
@@ -174,7 +174,7 @@ msgid "Server type:"
 msgstr "Тип сервера:"
 
 #: source/ubl-strings.h:51
-msgid "IP adress:"
+msgid "IP address:"
 msgstr "IP-адрес:"
 
 #: source/ubl-strings.h:52
diff --git a/source/ubl-settings-repomanager-key.c b/source/ubl-settings-repomanager-key.c
index dc0eba8..4cf5869 100644
--- a/source/ubl-settings-repomanager-key.c
+++ b/source/ubl-settings-repomanager-key.c
@@ -16,8 +16,8 @@ void on_key_generate_accept(GtkWidget *self, key_creation_window* window){
         yon_ubl_status_highlight_incorrect(window->NameEntry);
         return;
     }
-    if (!yon_char_is_empty(email)&&strlen(email)<5){
-        yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),NAME_SHORT_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
+    if (!yon_char_is_empty(email)&&!g_regex_match_simple("^(?!.*[@.]{2})(?!^[@.])[^@.]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,}$",email,0,0)){
+        yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),yon_char_get_localised_from_lib(EMAIL_INVALID_LABEL),5,BACKGROUND_IMAGE_FAIL_TYPE);
         yon_ubl_status_highlight_incorrect(window->EmailEntry);
         return;
     }
@@ -36,6 +36,11 @@ void on_key_generate_accept(GtkWidget *self, key_creation_window* window){
         yon_ubl_status_highlight_incorrect(highlight_target);
         return;
     }
+    if (highlight_target){
+        yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),EMPTY_IMPORTANT_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
+        yon_ubl_status_highlight_incorrect(highlight_target);
+        return;
+    }
     char *expire = NULL;
     if (gtk_combo_box_get_active(GTK_COMBO_BOX(window->ExpireCombo))==1){
         GDateTime *datetime = g_date_time_new_from_unix_local(yon_calendar_get_last_date());
@@ -91,6 +96,9 @@ key_creation_window *yon_key_creation_window_new(){
     window->PasswordEntry = yon_gtk_builder_get_widget(builder,"PasswordEntry");
     window->PasswordConfirmationEntry = yon_gtk_builder_get_widget(builder,"PasswordConfirmationEntry");
 
+    yon_gtk_entry_block_symbols(GTK_ENTRY(window->EmailEntry),"()\'\"&^%$#!*=\\|?><~`:;,[]{}");
+    yon_gtk_entry_block_symbols(GTK_ENTRY(window->NameEntry),"()\'\"&^%$#@!+*=\\|?><~`:;,[]{}");
+
     yon_gtk_entry_set_password_visibility_icon(GTK_ENTRY(window->PasswordConfirmationEntry));
     yon_gtk_entry_set_password_visibility_icon(GTK_ENTRY(window->PasswordEntry));
 
diff --git a/source/ubl-strings.h b/source/ubl-strings.h
index f107a44..c443502 100644
--- a/source/ubl-strings.h
+++ b/source/ubl-strings.h
@@ -2,13 +2,8 @@
 #define TITLE_LABEL _("Repository manager")
 #define TITLE_INFO_LABEL _("Repository management and configuring")
 
-#define WIKI_LINK _("https://wiki.ublinux.ru/en/Software/Programs_and_utilities/All/ubl-settings-repomanager")
+#define WIKI_LINK _("https://wiki.ublinux.ru/software/programs_and_utilities/all/ubl-settings-repomanager")
 
-#define HELP_TITLE_LABEL _("Would you like to read documentation in the Web?")
-#define HELP_INFO_LABEL _("You will be redirected to documentation website where documentation is\ntranslated and supported by community.")
-#define HELP_ALWAYS_OPEN_LABEL _("Always redirect to online documentation")
-#define OPEN_HELP_LABEL _("Open documentation")
-#define PROJECT_HOME_LABEL _("Project Home Page")
 #define NOTHING_CHOSEN_LABEL _("Nothing were chosen")
 
 #define INFORMATION_LABEL _("Information")
@@ -48,7 +43,7 @@
 #define PUBLICATION_TAB_LABEL _("Publication")
 #define TRUSTED_LABEL _("Trusted repository")
 #define SERVER_TYPE_LABEL _("Server type:")
-#define IP_ADRESS_LABEL _("IP adress:")
+#define IP_ADRESS_LABEL _("IP address:")
 #define PORT_LABEL _("Port:")
 #define PUBLISH_LABEL _("Publish")
 #define CODE_NAME_LABEL _("Code name:")