diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedFragment.kt
index 99090902..aaea31ec 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedFragment.kt
@@ -146,6 +146,20 @@ class LoginAdvancedFragment : BaseFragment(), LoginAdvancedView {
         }
     }
 
+    override fun setErrorLoginRequired() {
+        with(loginFormUsernameLayout) {
+            requestFocus()
+            error = getString(R.string.login_invalid_login)
+        }
+    }
+
+    override fun setErrorEmailRequired() {
+        with(loginFormUsernameLayout) {
+            requestFocus()
+            error = getString(R.string.login_invalid_email)
+        }
+    }
+
     override fun setErrorPassRequired(focus: Boolean) {
         with(loginFormPassLayout) {
             if (focus) requestFocus()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedPresenter.kt
index 212f7b67..3a0d4a0d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedPresenter.kt
@@ -173,6 +173,8 @@ class LoginAdvancedPresenter @Inject constructor(
         val login = view?.formUsernameValue.orEmpty()
         val password = view?.formPassValue.orEmpty()
 
+        val host = view?.formHostValue.orEmpty()
+
         val pin = view?.formPinValue.orEmpty()
         val symbol = view?.formSymbolValue.orEmpty()
         val token = view?.formTokenValue.orEmpty()
@@ -196,26 +198,20 @@ class LoginAdvancedPresenter @Inject constructor(
                     isCorrect = false
                 }
             }
-            Sdk.Mode.SCRAPPER -> {
+            Sdk.Mode.HYBRID, Sdk.Mode.SCRAPPER -> {
                 if (login.isEmpty()) {
                     view?.setErrorUsernameRequired()
                     isCorrect = false
-                }
+                } else {
+                    if ("@" in login && "standard" !in host) {
+                        view?.setErrorLoginRequired()
+                        isCorrect = false
+                    }
 
-                if (password.isEmpty()) {
-                    view?.setErrorPassRequired(focus = isCorrect)
-                    isCorrect = false
-                }
-
-                if (password.length < 6 && password.isNotEmpty()) {
-                    view?.setErrorPassInvalid(focus = isCorrect)
-                    isCorrect = false
-                }
-            }
-            Sdk.Mode.HYBRID -> {
-                if (login.isEmpty()) {
-                    view?.setErrorUsernameRequired()
-                    isCorrect = false
+                    if ("@" !in login && "standard" in host) {
+                        view?.setErrorEmailRequired()
+                        isCorrect = false
+                    }
                 }
 
                 if (password.isEmpty()) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedView.kt
index eb280235..36c9a93f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedView.kt
@@ -41,6 +41,10 @@ interface LoginAdvancedView : BaseView {
 
     fun setErrorUsernameRequired()
 
+    fun setErrorLoginRequired()
+
+    fun setErrorEmailRequired()
+
     fun setErrorPassRequired(focus: Boolean)
 
     fun setErrorPassInvalid(focus: Boolean)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
index 67e8a740..b79da3cc 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
@@ -121,6 +121,20 @@ class LoginFormFragment : BaseFragment(), LoginFormView {
         }
     }
 
+    override fun setErrorLoginRequired() {
+        with(loginFormUsernameLayout) {
+            requestFocus()
+            error = getString(R.string.login_invalid_login)
+        }
+    }
+
+    override fun setErrorEmailRequired() {
+        with(loginFormUsernameLayout) {
+            requestFocus()
+            error = getString(R.string.login_invalid_email)
+        }
+    }
+
     override fun setErrorSymbolRequired(focus: Boolean) {
         with(loginFormSymbolLayout) {
             if (focus) requestFocus()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
index 6d429285..3ed40539 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
@@ -131,6 +131,16 @@ class LoginFormPresenter @Inject constructor(
         if (login.isEmpty()) {
             view?.setErrorUsernameRequired()
             isCorrect = false
+        } else {
+            if ("@" in login && "standard" !in host) {
+                view?.setErrorLoginRequired()
+                isCorrect = false
+            }
+
+            if ("@" !in login && "standard" in host) {
+                view?.setErrorEmailRequired()
+                isCorrect = false
+            }
         }
 
         if (password.isEmpty()) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
index 4a570f5c..80cf5844 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
@@ -31,6 +31,10 @@ interface LoginFormView : BaseView {
 
     fun setErrorUsernameRequired()
 
+    fun setErrorLoginRequired()
+
+    fun setErrorEmailRequired()
+
     fun setErrorSymbolRequired(focus: Boolean)
 
     fun setErrorPassRequired(focus: Boolean)
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 9d14bb56..87c90654 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -48,6 +48,7 @@
     <string name="login_invalid_token">Ungültige token</string>
     <string name="login_expired_token">Token ist nicht mehr gültig</string>
     <string name="login_invalid_email">Ungültige email</string>
+    <string name="login_invalid_login">Ungültige login</string>
     <string name="login_invalid_symbol">Ungültige symbol</string>
     <string name="login_incorrect_symbol">Student nicht gefunden. Überprüfen Sie das Symbol</string>
     <string name="login_field_required">Dieses Datenfeld ist erforderlich</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index af35109f..c80137b1 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -49,6 +49,7 @@
     <string name="login_invalid_token">Nieprawidłowy token</string>
     <string name="login_expired_token">Token stracił ważność</string>
     <string name="login_invalid_email">Niepoprawny adres email</string>
+    <string name="login_invalid_login">Niepoprawny login</string>
     <string name="login_invalid_symbol">Niepoprawny symbol</string>
     <string name="login_incorrect_symbol">Nie znaleziono ucznia. Sprawdź symbol</string>
     <string name="login_field_required">To pole jest wymagane</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 5ff83d3e..e5530400 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -49,6 +49,7 @@
     <string name="login_invalid_token">Недействительный token</string>
     <string name="login_expired_token">Токен просрочен</string>
     <string name="login_invalid_email">Неверный адрес электронной почты</string>
+    <string name="login_invalid_login">Неправильный логин</string>
     <string name="login_invalid_symbol">Недействительный symbol</string>
     <string name="login_incorrect_symbol">Не удалось найти ученика. Пожалуйста, проверьте \"symbol\"</string>
     <string name="login_field_required">Это поле обязательно</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 47b06ca3..cd1c3b5d 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -49,6 +49,7 @@
     <string name="login_invalid_pin">Недійсний PIN</string>
     <string name="login_invalid_token">Недійсний token</string>
     <string name="login_invalid_email">Недійсна адреса електронної пошти</string>
+    <string name="login_invalid_login">Невірний логін</string>
     <string name="login_expired_token">Токен протермінований</string>
     <string name="login_invalid_symbol">Недійсний symbol</string>
     <string name="login_incorrect_symbol">Не вдалося знайти учня. Будь ласка, перевірте \"symbol\"</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 21ee8bed..30cc086d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -50,6 +50,7 @@
     <string name="login_invalid_token">Invalid token</string>
     <string name="login_expired_token">Token expired</string>
     <string name="login_invalid_email">Invalid email</string>
+    <string name="login_invalid_login">Invalid login</string>
     <string name="login_invalid_symbol">Invalid symbol</string>
     <string name="login_incorrect_symbol">Student not found. Check the symbol</string>
     <string name="login_field_required">This field is required</string>
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt
index 05b543f1..779a605f 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt
@@ -52,7 +52,7 @@ class LoginFormPresenterTest {
     fun emptyNicknameLoginTest() {
         `when`(loginFormView.formUsernameValue).thenReturn("")
         `when`(loginFormView.formPassValue).thenReturn("test123")
-        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf/?standard")
         presenter.onSignInClick()
 
         verify(loginFormView).setErrorUsernameRequired()
@@ -64,7 +64,7 @@ class LoginFormPresenterTest {
     fun emptyPassLoginTest() {
         `when`(loginFormView.formUsernameValue).thenReturn("@")
         `when`(loginFormView.formPassValue).thenReturn("")
-        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf/?standard")
         presenter.onSignInClick()
 
         verify(loginFormView, never()).setErrorUsernameRequired()
@@ -76,7 +76,7 @@ class LoginFormPresenterTest {
     fun invalidPassLoginTest() {
         `when`(loginFormView.formUsernameValue).thenReturn("@")
         `when`(loginFormView.formPassValue).thenReturn("123")
-        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf/?standard")
         presenter.onSignInClick()
 
         verify(loginFormView, never()).setErrorUsernameRequired()
@@ -86,12 +86,12 @@ class LoginFormPresenterTest {
 
     @Test
     fun loginTest() {
-        val studentTest = Student(email = "test@", password = "123", scrapperBaseUrl = "https://fakelog.cf", loginType = "AUTO", studentName = "", schoolSymbol = "", schoolName = "", studentId = 0, classId = 1, isCurrent = false, symbol = "", registrationDate = now(), className = "", mobileBaseUrl = "", privateKey = "", certificateKey = "", loginMode = "", userLoginId = 0, schoolShortName = "", isParent = false)
+        val studentTest = Student(email = "test@", password = "123", scrapperBaseUrl = "https://fakelog.cf/", loginType = "AUTO", studentName = "", schoolSymbol = "", schoolName = "", studentId = 0, classId = 1, isCurrent = false, symbol = "", registrationDate = now(), className = "", mobileBaseUrl = "", privateKey = "", certificateKey = "", loginMode = "", userLoginId = 0, schoolShortName = "", isParent = false)
         doReturn(Single.just(listOf(studentTest))).`when`(repository).getStudentsScrapper(anyString(), anyString(), anyString(), anyString())
 
         `when`(loginFormView.formUsernameValue).thenReturn("@")
         `when`(loginFormView.formPassValue).thenReturn("123456")
-        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf/?standard")
         `when`(loginFormView.formSymbolValue).thenReturn("Default")
         `when`(loginFormView.formHostSymbol).thenReturn("Default")
         presenter.onSignInClick()
@@ -109,7 +109,7 @@ class LoginFormPresenterTest {
             .`when`(repository).getStudentsScrapper(anyString(), anyString(), anyString(), anyString())
         `when`(loginFormView.formUsernameValue).thenReturn("@")
         `when`(loginFormView.formPassValue).thenReturn("123456")
-        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf/?standard")
         `when`(loginFormView.formSymbolValue).thenReturn("Default")
         `when`(loginFormView.formHostSymbol).thenReturn("Default")
         presenter.onSignInClick()
@@ -127,7 +127,7 @@ class LoginFormPresenterTest {
             .`when`(repository).getStudentsScrapper(anyString(), anyString(), anyString(), anyString())
         `when`(loginFormView.formUsernameValue).thenReturn("@")
         `when`(loginFormView.formPassValue).thenReturn("123456")
-        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf/?standard")
         `when`(loginFormView.formSymbolValue).thenReturn("Default")
         `when`(loginFormView.formHostSymbol).thenReturn("Default")
         presenter.onSignInClick()
@@ -146,7 +146,7 @@ class LoginFormPresenterTest {
         doReturn(Single.error<List<Student>>(testException)).`when`(repository).getStudentsScrapper(anyString(), anyString(), anyString(), anyString())
         `when`(loginFormView.formUsernameValue).thenReturn("@")
         `when`(loginFormView.formPassValue).thenReturn("123456")
-        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf/?standard")
         `when`(loginFormView.formSymbolValue).thenReturn("Default")
         `when`(loginFormView.formHostSymbol).thenReturn("Default")
         presenter.onSignInClick()