diff --git a/app/javascript/dashboard/i18n/locale/en/signup.json b/app/javascript/dashboard/i18n/locale/en/signup.json
index 8dd5c0d4e..089848b19 100644
--- a/app/javascript/dashboard/i18n/locale/en/signup.json
+++ b/app/javascript/dashboard/i18n/locale/en/signup.json
@@ -3,10 +3,10 @@
     "TRY_WOOT": "Register an account",
     "TITLE": "Register",
     "TERMS_ACCEPT": "By signing up, you agree to our <a href=\"https://www.chatwoot.com/terms\">T & C</a> and <a href=\"https://www.chatwoot.com/privacy-policy\">Privacy policy</a>",
-    "ACCOUNT_NAME": {
-      "LABEL": "Account name",
-      "PLACEHOLDER": "Enter an account name. eg: Wayne Enterprises",
-      "ERROR": "Account name is too short"
+    "COMPANY_NAME": {
+      "LABEL": "Company name",
+      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
+      "ERROR": "Company name is too short"
     },
     "FULL_NAME": {
       "LABEL": "Full name",
@@ -16,7 +16,7 @@
     "EMAIL": {
       "LABEL": "Work email",
       "PLACEHOLDER": "Enter your work email address. eg: bruce@wayne.enterprises",
-      "ERROR": "Email address is invalid"
+      "ERROR": "Please enter a valid work email address"
     },
     "PASSWORD": {
       "LABEL": "Password",
diff --git a/app/javascript/dashboard/routes/auth/Signup.vue b/app/javascript/dashboard/routes/auth/Signup.vue
index a75cfc087..7f378bdc3 100644
--- a/app/javascript/dashboard/routes/auth/Signup.vue
+++ b/app/javascript/dashboard/routes/auth/Signup.vue
@@ -39,11 +39,11 @@
           <woot-input
             v-model="credentials.accountName"
             :class="{ error: $v.credentials.accountName.$error }"
-            :label="$t('REGISTER.ACCOUNT_NAME.LABEL')"
-            :placeholder="$t('REGISTER.ACCOUNT_NAME.PLACEHOLDER')"
+            :label="$t('REGISTER.COMPANY_NAME.LABEL')"
+            :placeholder="$t('REGISTER.COMPANY_NAME.PLACEHOLDER')"
             :error="
               $v.credentials.accountName.$error
-                ? $t('REGISTER.ACCOUNT_NAME.ERROR')
+                ? $t('REGISTER.COMPANY_NAME.ERROR')
                 : ''
             "
             @blur="$v.credentials.accountName.$touch"
@@ -104,6 +104,9 @@ import alertMixin from 'shared/mixins/alertMixin';
 import { DEFAULT_REDIRECT_URL } from '../../constants';
 import VueHcaptcha from '@hcaptcha/vue-hcaptcha';
 import { isValidPassword } from 'shared/helpers/Validators';
+
+const CompanyEmailValidator = require('company-email-validator');
+
 export default {
   components: {
     VueHcaptcha,
@@ -136,6 +139,9 @@ export default {
       email: {
         required,
         email,
+        businessEmailValidator(value) {
+          return CompanyEmailValidator.isCompanyEmail(value);
+        },
       },
       password: {
         required,
diff --git a/app/javascript/dashboard/routes/auth/auth.routes.js b/app/javascript/dashboard/routes/auth/auth.routes.js
index abd8d2763..f0093d8bc 100644
--- a/app/javascript/dashboard/routes/auth/auth.routes.js
+++ b/app/javascript/dashboard/routes/auth/auth.routes.js
@@ -1,10 +1,11 @@
 import Auth from './Auth';
 import Confirmation from './Confirmation';
-import Signup from './Signup';
 import PasswordEdit from './PasswordEdit';
 import ResetPassword from './ResetPassword';
 import { frontendURL } from '../../helper/URLHelper';
 
+const Signup = () => import('./Signup');
+
 export default {
   routes: [
     {
diff --git a/package.json b/package.json
index 8a087d486..00b05a2da 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
     "babel-plugin-syntax-jsx": "^6.18.0",
     "babel-plugin-transform-vue-jsx": "^3.7.0",
     "chart.js": "~2.9.4",
+    "company-email-validator": "^1.0.8",
     "core-js": "3.11.0",
     "date-fns": "2.21.1",
     "date-fns-tz": "^1.3.3",
diff --git a/yarn.lock b/yarn.lock
index e81ffabcb..a7e5a91af 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5347,6 +5347,13 @@ commondir@^1.0.1:
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
   integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
 
+company-email-validator@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/company-email-validator/-/company-email-validator-1.0.8.tgz#b09e4a4c5d4e19eadafbfc8ed7688b39ad24d868"
+  integrity sha512-zxqY83XAdqxqjEGLAXZCv++3er280aquey/jWCSIFfW3pn85Y1Dk34ljhUpZvh0n4OM+gPsOLjIk6lvHmeSIWg==
+  dependencies:
+    email-validator "^2.0.4"
+
 component-emitter@^1.2.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
@@ -6451,6 +6458,11 @@ elliptic@^6.5.3:
     minimalistic-assert "^1.0.1"
     minimalistic-crypto-utils "^1.0.1"
 
+email-validator@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/email-validator/-/email-validator-2.0.4.tgz#b8dfaa5d0dae28f1b03c95881d904d4e40bfe7ed"
+  integrity sha512-gYCwo7kh5S3IDyZPLZf6hSS0MnZT8QmJFqYvbqlDZSbwdZlY6QZWxJ4i/6UhITOJ4XzyI647Bm2MXKCLqnJ4nQ==
+
 emittery@^0.7.1:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.7.2.tgz#25595908e13af0f5674ab419396e2fb394cdfa82"