diff --git a/dist/package-shared/actions/users/login-user.js b/dist/package-shared/actions/users/login-user.js
index b7f2187..eae3d6d 100644
--- a/dist/package-shared/actions/users/login-user.js
+++ b/dist/package-shared/actions/users/login-user.js
@@ -65,7 +65,8 @@ function loginUser(_a) {
          * @description Check required fields
          */
         const isEmailValid = yield (0, validate_email_1.default)({ email: payload.email });
-        if (!payload.email || !isEmailValid.isValid) {
+        if ((!payload.email && !payload.username) ||
+            (payload.email && !isEmailValid.isValid)) {
             return {
                 success: false,
                 payload: null,
diff --git a/dist/package-shared/types/index.d.ts b/dist/package-shared/types/index.d.ts
index 22f87ad..9d9192d 100644
--- a/dist/package-shared/types/index.d.ts
+++ b/dist/package-shared/types/index.d.ts
@@ -1045,7 +1045,7 @@ export type MariadbRemoteServerUserObject = {
 };
 export type APILoginFunctionParams = {
     encryptionKey: string;
-    email: string;
+    email?: string;
     username?: string;
     password?: string;
     database: string;
diff --git a/package-shared/actions/users/login-user.ts b/package-shared/actions/users/login-user.ts
index 689cecf..ce0aba9 100644
--- a/package-shared/actions/users/login-user.ts
+++ b/package-shared/actions/users/login-user.ts
@@ -114,7 +114,10 @@ export default async function loginUser({
      */
     const isEmailValid = await validateEmail({ email: payload.email });
 
-    if (!payload.email || !isEmailValid.isValid) {
+    if (
+        (!payload.email && !payload.username) ||
+        (payload.email && !isEmailValid.isValid)
+    ) {
         return {
             success: false,
             payload: null,
diff --git a/package-shared/types/index.ts b/package-shared/types/index.ts
index fd6de22..a990d01 100644
--- a/package-shared/types/index.ts
+++ b/package-shared/types/index.ts
@@ -1211,7 +1211,7 @@ export type MariadbRemoteServerUserObject = {
 
 export type APILoginFunctionParams = {
     encryptionKey: string;
-    email: string;
+    email?: string;
     username?: string;
     password?: string;
     database: string;
diff --git a/package.json b/package.json
index 7603329..193a616 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@moduletrace/datasquirel",
-    "version": "4.2.7",
+    "version": "4.2.8",
     "description": "Cloud-based SQL data management tool",
     "main": "dist/index.js",
     "bin": {