diff --git a/loginscreen.cpp b/loginscreen.cpp
index 36aaef1..aa19c38 100644
--- a/loginscreen.cpp
+++ b/loginscreen.cpp
@@ -107,8 +107,12 @@ void LoginScreen::getCredentials(string &email, string &pass)
             case 10: // ENTER
                 if(currPos == EMAIL)
                     currPos++;
-                else
-                    stop = true;
+                else {
+                    if(email.length() < 3 || pass.length() < 3)
+                        ui_utils::alert(stdscr, "Please complete all the field before submitting form!");
+                    else
+                        stop = true;
+                }
                 break;