diff --git a/source/libublsettingsui-gtk3.c b/source/libublsettingsui-gtk3.c
index 494b4cf..a72143b 100644
--- a/source/libublsettingsui-gtk3.c
+++ b/source/libublsettingsui-gtk3.c
@@ -569,7 +569,11 @@ char *yon_gtk_entry_check_restricted(GtkEntry *target){
     switch(purpose){
         case GTK_INPUT_PURPOSE_EMAIL:{
             char *temp = NULL;
-            if (!((temp = strstr(text,"@"))&&strstr(temp,"."))){
+            if (!((temp = strstr(text,"@"))&&
+            strstr(temp,".")&&
+            strlen(temp)!=strlen(text)&&
+            temp[1]!='.'&&
+            strstr(temp,".")[1]!='\0')){
                 error = yon_char_get_localised_from_lib(EMAIL_INVALID_LABEL);
             }
         }