diff --git a/static/src/app/screens/login_screen/login_screen.js b/static/src/app/screens/login_screen/login_screen.js
index d2fa538..e061a0d 100644
--- a/static/src/app/screens/login_screen/login_screen.js
+++ b/static/src/app/screens/login_screen/login_screen.js
@@ -16,7 +16,12 @@ patch(LoginScreen.prototype, {
         } else {
             const allEmployees = this.pos.models["hr.employee"].getAll();
             if (allEmployees.length) {
-                this.pos.setCashier(allEmployees[0]);
+                const nonWaiterEmployee = allEmployees.find(emp => emp.pos_role !== 'waiter');
+                if (nonWaiterEmployee) {
+                    this.pos.setCashier(nonWaiterEmployee);
+                } else {
+                    this.pos.setCashier(allEmployees[0]);
+                }
             }
             this.cashierLogIn();
         }