diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index 7f9f15944d7..040bd8a99c5 100644
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -7,7 +7,7 @@
 // commands please read more here:
 // https://on.cypress.io/custom-commands
 // ***********************************************
-//
+// @author Roman Rezinkin roman.rezinkin@hotmail.com
 //
 // -- This is a parent command --
 // Cypress.Commands.add('login', (email, password) => { ... })
@@ -52,13 +52,13 @@ Cypress.Commands.add('signinOrSignup', (_args) => {
           cy.wait(8000);
           cy.get('body').trigger('mousemove');
           cy.contains('Let\'s Begin').click();
-          cy.get('input[type="text"]', { timeout: 12000 }).type(args.username);
+          cy.get('input[type="email"]', { timeout: 12000 }).type(args.username);
           cy.get('input[type="password"]').type(args.password);
           cy.get('button:contains("SIGN UP")').click()
 
           // handle signin
         } else {
-          cy.get('input[type="text"]', { timeout: 12000 }).type(args.username);
+          cy.get('input[type="email"]', { timeout: 12000 }).type(args.username);
           cy.get('input[type="password"]').type(args.password);
           cy.get('button:contains("SIGN IN")').click()
         }
diff --git a/cypress/support/page_objects/mainPage.js b/cypress/support/page_objects/mainPage.js
index 349bec68158..536f54265e2 100644
--- a/cypress/support/page_objects/mainPage.js
+++ b/cypress/support/page_objects/mainPage.js
@@ -71,7 +71,7 @@ export class _mainPage {
 
             // Redirected to new URL, feed details
             //
-            cy.get('input[type="text"]').type(userCred.username)
+            cy.get('input[type="email"]').type(userCred.username)
             cy.get('input[type="password"]').type(userCred.password)
             cy.get('button:contains("SIGN UP")').click()
 
diff --git a/cypress/support/page_objects/navigation.js b/cypress/support/page_objects/navigation.js
index 0bc6ad1ddaf..dfd2e6bc412 100644
--- a/cypress/support/page_objects/navigation.js
+++ b/cypress/support/page_objects/navigation.js
@@ -26,7 +26,7 @@ export class _loginPage {
     signIn(userCredentials) {
         this.go(urlPool.ncUrlSignIn)
 
-        cy.get('input[type="text"]', {timeout: 6000}).type(userCredentials.username)
+        cy.get('input[type="email"]', {timeout: 6000}).type(userCredentials.username)
         cy.get('input[type="password"]').type(userCredentials.password)
         cy.get('button:contains("SIGN IN")').click()
 
@@ -38,7 +38,7 @@ export class _loginPage {
     signUp(userCredentials) {
         this.go(urlPool.ncUrlSignUp)
 
-        cy.get('input[type="text"]', {timeout: 6000}).type(userCredentials.username)
+        cy.get('input[type="email"]', {timeout: 6000}).type(userCredentials.username)
         cy.get('input[type="password"]').type(userCredentials.password)
         cy.get('button:contains("SIGN UP")').click()
 
diff --git a/packages/nocodb/src/lib/public/index.html b/packages/nocodb/src/lib/public/index.html
index 1f5351b2fa4..8caf6ac19b4 100644
--- a/packages/nocodb/src/lib/public/index.html
+++ b/packages/nocodb/src/lib/public/index.html
@@ -371,7 +371,7 @@ <h2 class="my-5 title grey--text text--darken-2">Instant APIs on any Database</h
                                                 <!-- real people should not fill this in and expect good things - do not remove this or risk form bot signups-->
                                                 <div style="position: absolute; left: -5000px;" aria-hidden="true">
                                                     <input
-                                                            type="text"
+                                                            type="email"
                                                             name="b_34a5d2680bab8825d485af859_f04c6c8b8d"
                                                             tabindex="-1" value=""></div>