diff --git a/app/common/src/main/java/stirling/software/common/model/enumeration/Role.java b/app/common/src/main/java/stirling/software/common/model/enumeration/Role.java
index bdda75d90..93e68b298 100644
--- a/app/common/src/main/java/stirling/software/common/model/enumeration/Role.java
+++ b/app/common/src/main/java/stirling/software/common/model/enumeration/Role.java
@@ -29,15 +29,6 @@ public enum Role {
     // Regular user with unlimited access within their team/org
     USER("ROLE_USER", Integer.MAX_VALUE, Integer.MAX_VALUE, "adminUserSettings.user"),
 
-    // 40 API calls Per Day, 40 web calls
-    LIMITED_API_USER("ROLE_LIMITED_API_USER", 40, 40, "adminUserSettings.apiUser"),
-
-    // 20 API calls Per Day, 20 web calls
-    EXTRA_LIMITED_API_USER("ROLE_EXTRA_LIMITED_API_USER", 20, 20, "adminUserSettings.extraApiUser"),
-
-    // 0 API calls per day and 20 web calls
-    WEB_ONLY_USER("ROLE_WEB_ONLY_USER", 0, 20, "adminUserSettings.webOnlyUser"),
-
     INTERNAL_API_USER(
             "STIRLING-PDF-BACKEND-API-USER",
             Integer.MAX_VALUE,
diff --git a/app/core/src/main/resources/messages_ar_AR.properties b/app/core/src/main/resources/messages_ar_AR.properties
index 2993800ac..2ad1c26d1 100644
--- a/app/core/src/main/resources/messages_ar_AR.properties
+++ b/app/core/src/main/resources/messages_ar_AR.properties
@@ -423,9 +423,6 @@ adminUserSettings.confirmChangeUserStatus=هل يجب تعطيل/تمكين ال
 adminUserSettings.usernameInfo=يمكن أن يحتوي اسم المستخدم فقط على أحرف وأرقام والرموز الخاصة التالية @._+- أو يجب أن يكون عنوان بريد إلكتروني صالح.
 adminUserSettings.role=الدور
 adminUserSettings.actions=الإجراءات
-adminUserSettings.apiUser=مستخدم API محدود
-adminUserSettings.extraApiUser=مستخدم API محدود إضافي
-adminUserSettings.webOnlyUser=مستخدم الويب فقط
 adminUserSettings.demoUser=مستخدم تجريبي (بدون إعدادات مخصصة)
 adminUserSettings.internalApiUser=مستخدم API داخلي
 adminUserSettings.forceChange=إجبار المستخدم على تغيير كلمة المرور عند تسجيل الدخول
diff --git a/app/core/src/main/resources/messages_az_AZ.properties b/app/core/src/main/resources/messages_az_AZ.properties
index c719d7139..a7660a43f 100644
--- a/app/core/src/main/resources/messages_az_AZ.properties
+++ b/app/core/src/main/resources/messages_az_AZ.properties
@@ -423,9 +423,6 @@ adminUserSettings.confirmChangeUserStatus=İstifadəçi aktivləşdirilməli/dea
 adminUserSettings.usernameInfo=İstifadəçi adı sadəcə hərflərdən, rəqəmlərdən və @._+- xüsusi simvollarından ibarət ola bilər və ya düzgün email ünvanı olmalıdır.
 adminUserSettings.role=Rol
 adminUserSettings.actions=Fəaliyyətlər
-adminUserSettings.apiUser=Məhdudlaşdırılmış API İstifadəçisi
-adminUserSettings.extraApiUser=Əlavə Məhdudlaşdırılmış API İstifadəçisi
-adminUserSettings.webOnlyUser=Yalnız Veb İstifadəçisi
 adminUserSettings.demoUser=Demo İstifadəçisi (Fərdi parametrlər yoxdur)
 adminUserSettings.internalApiUser=Daxili API İstifadəçisi
 adminUserSettings.forceChange=İstifadəçini giriş zamanı parolu dəyişməyə məcbur et
diff --git a/app/core/src/main/resources/messages_bg_BG.properties b/app/core/src/main/resources/messages_bg_BG.properties
index eaaeb5d95..32ef3b97e 100644
--- a/app/core/src/main/resources/messages_bg_BG.properties
+++ b/app/core/src/main/resources/messages_bg_BG.properties
@@ -423,9 +423,6 @@ adminUserSettings.confirmChangeUserStatus=Трябва ли потребител
 adminUserSettings.usernameInfo=Потребителското име може да съдържа само букви, цифри и следните специални символи @._+- или трябва да е валиден имейл адрес.
 adminUserSettings.role=Роля
 adminUserSettings.actions=Действия
-adminUserSettings.apiUser=Ограничен API потребител
-adminUserSettings.extraApiUser=Допълнителен ограничен API потребител
-adminUserSettings.webOnlyUser=Само за уеб-потребител
 adminUserSettings.demoUser=Демо потребител (без персонализирани настройки)
 adminUserSettings.internalApiUser=Вътрешен API потребител
 adminUserSettings.forceChange=Принудете потребителя да промени потребителското име/парола при влизане
diff --git a/app/core/src/main/resources/messages_bo_CN.properties b/app/core/src/main/resources/messages_bo_CN.properties
index d84b4a387..b60565449 100644
--- a/app/core/src/main/resources/messages_bo_CN.properties
+++ b/app/core/src/main/resources/messages_bo_CN.properties
@@ -423,9 +423,6 @@ adminUserSettings.confirmChangeUserStatus=སྤྱོད་མཁན་སྤ
 adminUserSettings.usernameInfo=སྤྱོད་མཁན་མིང་ནང་ཡི་གེ་དང་ཨང་ཀི། དམིགས་བསལ་མཚོན་རྟགས་ @._+- ཡང་ན་གློག་འཕྲིན་ཁ་བྱང་ཚད་ལྡན་ཞིག་དགོས།
 adminUserSettings.role=འགན་འཁུར།
 adminUserSettings.actions=བྱ་སྤྱོད།
-adminUserSettings.apiUser=ཚད་བཀག་ཅན་གྱི་ API སྤྱོད་མཁན།
-adminUserSettings.extraApiUser=ཚད་བཀག་ཅན་གྱི་ API སྤྱོད་མཁན་འཕར་མ།
-adminUserSettings.webOnlyUser=དྲ་ཚིགས་ཁོ་ནའི་སྤྱོད་མཁན།
 adminUserSettings.demoUser=བརྟག་དཔྱད་སྤྱོད་མཁན། (རང་སྒྲིག་མེད་པ།)
 adminUserSettings.internalApiUser=ནང་ཁུལ་ API སྤྱོད་མཁན།
 adminUserSettings.forceChange=ནང་འཛུལ་སྐབས་གསང་ཚིག་བསྒྱུར་དགོས་པ་བཟོ་བ།
diff --git a/app/core/src/main/resources/messages_ca_CA.properties b/app/core/src/main/resources/messages_ca_CA.properties
index 30a7f7624..3d95e5b34 100644
--- a/app/core/src/main/resources/messages_ca_CA.properties
+++ b/app/core/src/main/resources/messages_ca_CA.properties
@@ -423,9 +423,6 @@ adminUserSettings.confirmChangeUserStatus=Vols deshabilitar/habilitar aquest usu
 adminUserSettings.usernameInfo=El nom d'usuari només pot contenir lletres, números i els següents caràcters especials: @._+- o ha de ser una adreça de correu electrònic vàlida.
 adminUserSettings.role=Rol
 adminUserSettings.actions=Accions
-adminUserSettings.apiUser=Usuari amb API limitada
-adminUserSettings.extraApiUser=Usuari Addicional amb API limitada
-adminUserSettings.webOnlyUser=Usuari només WEB
 adminUserSettings.demoUser=Usuari de Demo (Sense configuracions personalitzades)
 adminUserSettings.internalApiUser=Usuari d'API Interna
 adminUserSettings.forceChange=Força l'usuari a canviar la contrasenya en iniciar sessió
diff --git a/app/core/src/main/resources/messages_cs_CZ.properties b/app/core/src/main/resources/messages_cs_CZ.properties
index 7eb854aaa..b652567e6 100644
--- a/app/core/src/main/resources/messages_cs_CZ.properties
+++ b/app/core/src/main/resources/messages_cs_CZ.properties
@@ -423,9 +423,6 @@ adminUserSettings.confirmChangeUserStatus=Má být uživatel deaktivován/aktivo
 adminUserSettings.usernameInfo=Uživatelské jméno může obsahovat pouze písmena, číslice a následující speciální znaky @._+- nebo musí být platná e-mailová adresa.
 adminUserSettings.role=Role
 adminUserSettings.actions=Akce
-adminUserSettings.apiUser=Omezený API uživatel
-adminUserSettings.extraApiUser=Další omezený API uživatel
-adminUserSettings.webOnlyUser=Pouze webový uživatel
 adminUserSettings.demoUser=Demo uživatel (Bez vlastních nastavení)
 adminUserSettings.internalApiUser=Interní API uživatel
 adminUserSettings.forceChange=Vynutit změnu hesla při přihlášení
diff --git a/app/core/src/main/resources/messages_da_DK.properties b/app/core/src/main/resources/messages_da_DK.properties
index 118e545e6..69c680f0b 100644
--- a/app/core/src/main/resources/messages_da_DK.properties
+++ b/app/core/src/main/resources/messages_da_DK.properties
@@ -423,9 +423,6 @@ adminUserSettings.confirmChangeUserStatus=Skal brugeren deaktiveres/aktiveres?
 adminUserSettings.usernameInfo=Brugernavn må kun indeholde bogstaver, tal og følgende specialtegn @._+- eller skal være en gyldig e-mailadresse.
 adminUserSettings.role=Rolle
 adminUserSettings.actions=Handlinger
-adminUserSettings.apiUser=Begrænset API-bruger
-adminUserSettings.extraApiUser=Yderligere Begrænset API-bruger
-adminUserSettings.webOnlyUser=Kun Web-bruger
 adminUserSettings.demoUser=Demo-bruger (Ingen brugerdefinerede indstillinger)
 adminUserSettings.internalApiUser=Intern API-bruger
 adminUserSettings.forceChange=Tving bruger til at ændre adgangskode ved login
diff --git a/app/core/src/main/resources/messages_de_DE.properties b/app/core/src/main/resources/messages_de_DE.properties
index 5f01823f1..83f506f50 100644
--- a/app/core/src/main/resources/messages_de_DE.properties
+++ b/app/core/src/main/resources/messages_de_DE.properties
@@ -423,9 +423,6 @@ adminUserSettings.confirmChangeUserStatus=Soll der Benutzer deaktiviert/aktivier
 adminUserSettings.usernameInfo=Der Benutzername darf nur Buchstaben, Zahlen und die folgenden Sonderzeichen @._+- enthalten oder muss eine gültige E-Mail-Adresse sein.
 adminUserSettings.role=Rolle
 adminUserSettings.actions=Aktionen
-adminUserSettings.apiUser=Eingeschränkter API-Benutzer
-adminUserSettings.extraApiUser=Zusätzlicher eingeschränkter API-Benutzer
-adminUserSettings.webOnlyUser=Nur Web-Benutzer
 adminUserSettings.demoUser=Demo-Benutzer (Keine benutzerdefinierten Einstellungen)
 adminUserSettings.internalApiUser=Interner API-Benutzer
 adminUserSettings.forceChange=Benutzer dazu zwingen, Benutzernamen/Passwort bei der Anmeldung zu ändern
diff --git a/app/core/src/main/resources/messages_el_GR.properties b/app/core/src/main/resources/messages_el_GR.properties
index 82fc98ef9..d6b16721d 100644
--- a/app/core/src/main/resources/messages_el_GR.properties
+++ b/app/core/src/main/resources/messages_el_GR.properties
@@ -423,9 +423,6 @@ adminUserSettings.confirmChangeUserStatus=Θέλετε να απενεργοπο
 adminUserSettings.usernameInfo=Το όνομα χρήστη μπορεί να περιέχει μόνο γράμματα, αριθμούς και τους ειδικούς χαρακτήρες @._+- ή πρέπει να είναι έγκυρη διεύθυνση email.
 adminUserSettings.role=Ρόλος
 adminUserSettings.actions=Ενέργειες
-adminUserSettings.apiUser=Περιορισμένος χρήστης API
-adminUserSettings.extraApiUser=Επιπλέον περιορισμένος χρήστης API
-adminUserSettings.webOnlyUser=Χρήστης μόνο web
 adminUserSettings.demoUser=Δοκιμαστικός χρήστης (Χωρίς προσαρμοσμένες ρυθμίσεις)
 adminUserSettings.internalApiUser=Εσωτερικός χρήστης API
 adminUserSettings.forceChange=Υποχρεωτική αλλαγή κωδικού κατά τη σύνδεση
diff --git a/app/core/src/main/resources/messages_en_GB.properties b/app/core/src/main/resources/messages_en_GB.properties
index b77391639..14db29f41 100644
--- a/app/core/src/main/resources/messages_en_GB.properties
+++ b/app/core/src/main/resources/messages_en_GB.properties
@@ -426,9 +426,6 @@ adminUserSettings.confirmChangeUserStatus=Should the user be disabled/enabled?
 adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.role=Role
 adminUserSettings.actions=Actions
-adminUserSettings.apiUser=Limited API User
-adminUserSettings.extraApiUser=Additional Limited API User
-adminUserSettings.webOnlyUser=Web Only User
 adminUserSettings.demoUser=Demo User (No custom settings)
 adminUserSettings.internalApiUser=Internal API User
 adminUserSettings.forceChange=Force user to change password on login
diff --git a/app/core/src/main/resources/messages_en_US.properties b/app/core/src/main/resources/messages_en_US.properties
index eb8a9236c..6094ed45f 100644
--- a/app/core/src/main/resources/messages_en_US.properties
+++ b/app/core/src/main/resources/messages_en_US.properties
@@ -423,9 +423,6 @@ adminUserSettings.confirmChangeUserStatus=Should the user be disabled/enabled?
 adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.role=Role
 adminUserSettings.actions=Actions
-adminUserSettings.apiUser=Limited API User
-adminUserSettings.extraApiUser=Additional Limited API User
-adminUserSettings.webOnlyUser=Web Only User
 adminUserSettings.demoUser=Demo User (No custom settings)
 adminUserSettings.internalApiUser=Internal API User
 adminUserSettings.forceChange=Force user to change password on login
diff --git a/app/core/src/main/resources/messages_es_ES.properties b/app/core/src/main/resources/messages_es_ES.properties
index 5601e76c0..bc3e19757 100644
--- a/app/core/src/main/resources/messages_es_ES.properties
+++ b/app/core/src/main/resources/messages_es_ES.properties
@@ -423,9 +423,6 @@ adminUserSettings.confirmChangeUserStatus=¿Se debe habilitar/deshabilitar el us
 adminUserSettings.usernameInfo=El nombre de usuario solo puede contener letras, números y los siguientes caracteres especiales @._+- o debe ser una dirección de correo electrónico válida.
 adminUserSettings.role=Rol
 adminUserSettings.actions=Acciones
-adminUserSettings.apiUser=Usuario limitado de API
-adminUserSettings.extraApiUser=Otro usuario limitado de API
-adminUserSettings.webOnlyUser=Usuario solo web
 adminUserSettings.demoUser=Usuario Demo (Sin ajustes personalizados)
 adminUserSettings.internalApiUser=Usuario interno de API
 adminUserSettings.forceChange=Forzar usuario a cambiar usuario/contraseña en el acceso
diff --git a/app/core/src/main/resources/messages_eu_ES.properties b/app/core/src/main/resources/messages_eu_ES.properties
index bda28227f..17b1f067f 100644
--- a/app/core/src/main/resources/messages_eu_ES.properties
+++ b/app/core/src/main/resources/messages_eu_ES.properties
@@ -423,9 +423,6 @@ adminUserSettings.confirmChangeUserStatus=Should the user be disabled/enabled?
 adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.role=Rol
 adminUserSettings.actions=Ekintzak
-adminUserSettings.apiUser=APIren erabiltzaile mugatua
-adminUserSettings.extraApiUser=Additional Limited API User
-adminUserSettings.webOnlyUser=Web-erabiltzailea bakarrik
 adminUserSettings.demoUser=Demo User (No custom settings)
 adminUserSettings.internalApiUser=Internal API User
 adminUserSettings.forceChange=Force user to change password on login
diff --git a/app/core/src/main/resources/messages_fa_IR.properties b/app/core/src/main/resources/messages_fa_IR.properties
index a1cfbe5b5..e5c386150 100644
--- a/app/core/src/main/resources/messages_fa_IR.properties
+++ b/app/core/src/main/resources/messages_fa_IR.properties
@@ -423,9 +423,6 @@ adminUserSettings.confirmChangeUserStatus=آیا باید وضعیت کاربر
 adminUserSettings.usernameInfo=نام کاربری فقط می‌تواند شامل حروف، اعداد و کاراکترهای خاص @._+- باشد یا باید یک آدرس ایمیل معتبر باشد.
 adminUserSettings.role=نقش
 adminUserSettings.actions=اقدامات
-adminUserSettings.apiUser=کاربر محدود API
-adminUserSettings.extraApiUser=کاربر محدود اضافی API
-adminUserSettings.webOnlyUser=فقط کاربر وب
 adminUserSettings.demoUser=کاربر دمو (بدون تنظیمات سفارشی)
 adminUserSettings.internalApiUser=کاربر داخلی API
 adminUserSettings.forceChange=مجبور کردن کاربر به تغییر رمز عبور هنگام ورود
diff --git a/app/core/src/main/resources/messages_fr_FR.properties b/app/core/src/main/resources/messages_fr_FR.properties
index 2a3a7c6b5..c39b18b27 100644
--- a/app/core/src/main/resources/messages_fr_FR.properties
+++ b/app/core/src/main/resources/messages_fr_FR.properties
@@ -423,9 +423,6 @@ adminUserSettings.confirmChangeUserStatus=Voulez vous vraiment déactiver/réact
 adminUserSettings.usernameInfo=Le nom d'utilisateur ne peut contenir que des lettres, des chiffres et les caractères spéciaux suivants @._+- ou doit être une adresse e-mail valide.
 adminUserSettings.role=Rôle
 adminUserSettings.actions=Actions
-adminUserSettings.apiUser=Utilisateur API limité
-adminUserSettings.extraApiUser=Utilisateur limité supplémentaire de l'API
-adminUserSettings.webOnlyUser=Utilisateur Web uniquement
 adminUserSettings.demoUser=Demo User (Paramètres par défaut)
 adminUserSettings.internalApiUser=Utilisateur de l'API interne
 adminUserSettings.forceChange=Forcer l'utilisateur à changer son nom d'utilisateur/mot de passe lors de la connexion
diff --git a/app/core/src/main/resources/messages_ga_IE.properties b/app/core/src/main/resources/messages_ga_IE.properties
index 7a5d87de3..865394566 100644
--- a/app/core/src/main/resources/messages_ga_IE.properties
+++ b/app/core/src/main/resources/messages_ga_IE.properties
@@ -423,9 +423,6 @@ adminUserSettings.confirmChangeUserStatus=Ar cheart an t-úsáideoir a dhíchuma
 adminUserSettings.usernameInfo=Ní féidir ach litreacha, uimhreacha agus na carachtair speisialta seo a leanas @._+- a bheith san ainm úsáideora nó ní mór gur seoladh ríomhphoist bailí é.
 adminUserSettings.role=Ról
 adminUserSettings.actions=Gníomhartha
-adminUserSettings.apiUser=Úsáideoir API Teoranta
-adminUserSettings.extraApiUser=Úsáideoir API Teoranta breise
-adminUserSettings.webOnlyUser=Úsáideoir Gréasáin Amháin
 adminUserSettings.demoUser=Úsáideoir Taispeána (Gan socruithe saincheaptha)
 adminUserSettings.internalApiUser=Úsáideoir API Inmheánach
 adminUserSettings.forceChange=Cuir iallach ar an úsáideoir pasfhocal a athrú ar logáil isteach
diff --git a/app/core/src/main/resources/messages_hi_IN.properties b/app/core/src/main/resources/messages_hi_IN.properties
index ced3f3300..c60731b84 100644
--- a/app/core/src/main/resources/messages_hi_IN.properties
+++ b/app/core/src/main/resources/messages_hi_IN.properties
@@ -423,9 +423,6 @@ adminUserSettings.confirmChangeUserStatus=क्या उपयोगकर्
 adminUserSettings.usernameInfo=उपयोगकर्ता नाम में केवल अक्षर, संख्याएं और निम्नलिखित विशेष वर्ण @._+- हो सकते हैं या एक वैध ईमेल पता होना चाहिए।
 adminUserSettings.role=भूमिका
 adminUserSettings.actions=कार्रवाइयां
-adminUserSettings.apiUser=सीमित API उपयोगकर्ता
-adminUserSettings.extraApiUser=अतिरिक्त सीमित API उपयोगकर्ता
-adminUserSettings.webOnlyUser=केवल वेब उपयोगकर्ता
 adminUserSettings.demoUser=डेमो उपयोगकर्ता (कोई कस्टम सेटिंग्स नहीं)
 adminUserSettings.internalApiUser=आंतरिक API उपयोगकर्ता
 adminUserSettings.forceChange=लॉगिन पर उपयोगकर्ता को पासवर्ड बदलने के लिए मजबूर करें
diff --git a/app/core/src/main/resources/messages_hr_HR.properties b/app/core/src/main/resources/messages_hr_HR.properties
index f311a93dd..3eefa982f 100644
--- a/app/core/src/main/resources/messages_hr_HR.properties
+++ b/app/core/src/main/resources/messages_hr_HR.properties
@@ -423,9 +423,6 @@ adminUserSettings.confirmChangeUserStatus=Treba li isključiti/uključiti ovog k
 adminUserSettings.usernameInfo=Korisničko ime može sadržavati samo slova, brojke i sljedeće posebne znakove @._+- ili mora biti važeća adresa e-pošte.
 adminUserSettings.role=Uloga
 adminUserSettings.actions=Akcije
-adminUserSettings.apiUser=Korisnik s ograničenim API pristupom
-adminUserSettings.extraApiUser=Dodatni korisnik s ograničenim API pristupom
-adminUserSettings.webOnlyUser=Web Korisnik
 adminUserSettings.demoUser=Demo korisnik (Bez prilagođenih Postavki)
 adminUserSettings.internalApiUser=Interni API Korisnik
 adminUserSettings.forceChange=Prisiliti korisnika da promijeni lozinku prilikom prijave
diff --git a/app/core/src/main/resources/messages_hu_HU.properties b/app/core/src/main/resources/messages_hu_HU.properties
index 3132d4fdc..7367459d3 100644
--- a/app/core/src/main/resources/messages_hu_HU.properties
+++ b/app/core/src/main/resources/messages_hu_HU.properties
@@ -423,9 +423,6 @@ adminUserSettings.confirmChangeUserStatus=Biztosan módosítja a felhasználó 
 adminUserSettings.usernameInfo=A felhasználónév csak betűket, számokat és a következő speciális karaktereket tartalmazhatja: @._+- vagy érvényes e-mail címnek kell lennie.
 adminUserSettings.role=Szerepkör
 adminUserSettings.actions=Műveletek
-adminUserSettings.apiUser=Korlátozott API felhasználó
-adminUserSettings.extraApiUser=További korlátozott API felhasználó
-adminUserSettings.webOnlyUser=Csak webes felhasználó
 adminUserSettings.demoUser=Demo felhasználó (egyedi beállítások nélkül)
 adminUserSettings.internalApiUser=Belső API felhasználó
 adminUserSettings.forceChange=Jelszóváltoztatás kikényszerítése bejelentkezéskor
diff --git a/app/core/src/main/resources/messages_id_ID.properties b/app/core/src/main/resources/messages_id_ID.properties
index 3a706535a..8f6c49b6e 100644
--- a/app/core/src/main/resources/messages_id_ID.properties
+++ b/app/core/src/main/resources/messages_id_ID.properties
@@ -423,9 +423,6 @@ adminUserSettings.confirmChangeUserStatus=Haruskah pengguna dinonaktifkan/diakti
 adminUserSettings.usernameInfo=Nama pengguna hanya boleh mengandung huruf, angka, dan karakter khusus berikut @._+- atau harus berupa alamat email yang valid.
 adminUserSettings.role=Peran
 adminUserSettings.actions=Tindakan
-adminUserSettings.apiUser=Pengguna API Terbatas
-adminUserSettings.extraApiUser=Pengguna API Terbatas Tambahan
-adminUserSettings.webOnlyUser=Pengguna Khusus Web
 adminUserSettings.demoUser=Pengguna Demo (Tanpa pengaturan kustom)
 adminUserSettings.internalApiUser=Pengguna API Internal
 adminUserSettings.forceChange=Memaksa pengguna untuk mengubah nama pengguna/kata sandi saat masuk
diff --git a/app/core/src/main/resources/messages_it_IT.properties b/app/core/src/main/resources/messages_it_IT.properties
index bba74394b..245d57776 100644
--- a/app/core/src/main/resources/messages_it_IT.properties
+++ b/app/core/src/main/resources/messages_it_IT.properties
@@ -423,9 +423,6 @@ adminUserSettings.confirmChangeUserStatus=L'utente dovrebbe essere disabilitato/
 adminUserSettings.usernameInfo=Il nome utente può contenere solo lettere, numeri e i seguenti caratteri speciali @._+- oppure deve essere un indirizzo email valido.
 adminUserSettings.role=Ruolo
 adminUserSettings.actions=Azioni
-adminUserSettings.apiUser=Utente API limitato
-adminUserSettings.extraApiUser=API utente limitato aggiuntivo
-adminUserSettings.webOnlyUser=Utente solo Web
 adminUserSettings.demoUser=Utente demo (nessuna impostazione personalizzata)
 adminUserSettings.internalApiUser=API utente interna
 adminUserSettings.forceChange=Forza l'utente a cambiare nome utente/password all'accesso
diff --git a/app/core/src/main/resources/messages_ja_JP.properties b/app/core/src/main/resources/messages_ja_JP.properties
index bdb30dc7b..7b21c83ff 100644
--- a/app/core/src/main/resources/messages_ja_JP.properties
+++ b/app/core/src/main/resources/messages_ja_JP.properties
@@ -423,9 +423,6 @@ adminUserSettings.confirmChangeUserStatus=ユーザーを無効/有効にする
 adminUserSettings.usernameInfo=ユーザー名には、文字、数字、および次の特殊文字 @._+- のみを含めることができます。または、有効な電子メール アドレスである必要があります。
 adminUserSettings.role=ロール
 adminUserSettings.actions=アクション
-adminUserSettings.apiUser=限定されたAPIユーザー
-adminUserSettings.extraApiUser=追加の制限付きAPIユーザー
-adminUserSettings.webOnlyUser=ウェブ専用ユーザー
 adminUserSettings.demoUser=デモユーザー (カスタム設定なし)
 adminUserSettings.internalApiUser=内部APIユーザー
 adminUserSettings.forceChange=ログイン時にユーザー名/パスワードを強制的に変更する
diff --git a/app/core/src/main/resources/messages_ko_KR.properties b/app/core/src/main/resources/messages_ko_KR.properties
index 76f7ca715..aed527ed9 100644
--- a/app/core/src/main/resources/messages_ko_KR.properties
+++ b/app/core/src/main/resources/messages_ko_KR.properties
@@ -423,9 +423,6 @@ adminUserSettings.confirmChangeUserStatus=사용자를 비활성화/활성화하
 adminUserSettings.usernameInfo=사용자 이름은 문자, 숫자 및 @._+- 특수문자만 포함하거나 유효한 이메일 주소여야 합니다.
 adminUserSettings.role=역할
 adminUserSettings.actions=작업
-adminUserSettings.apiUser=제한된 API 사용자
-adminUserSettings.extraApiUser=추가 제한된 API 사용자
-adminUserSettings.webOnlyUser=웹 전용 사용자
 adminUserSettings.demoUser=데모 사용자 (사용자 지정 설정 없음)
 adminUserSettings.internalApiUser=내부 API 사용자
 adminUserSettings.forceChange=로그인 시 사용자 비밀번호 변경 강제
diff --git a/app/core/src/main/resources/messages_ml_IN.properties b/app/core/src/main/resources/messages_ml_IN.properties
index 164209212..cecc76c02 100644
--- a/app/core/src/main/resources/messages_ml_IN.properties
+++ b/app/core/src/main/resources/messages_ml_IN.properties
@@ -423,9 +423,6 @@ adminUserSettings.confirmChangeUserStatus=ഉപയോക്താവിനെ 
 adminUserSettings.usernameInfo=ഉപയോക്തൃനാമത്തിൽ അക്ഷരങ്ങൾ, അക്കങ്ങൾ, താഴെ പറയുന്ന പ്രത്യേക പ്രതീകങ്ങൾ @._+- എന്നിവ മാത്രമേ ഉണ്ടാകാവൂ അല്ലെങ്കിൽ സാധുവായ ഒരു ഇമെയിൽ വിലാസം ആയിരിക്കണം.
 adminUserSettings.role=റോൾ
 adminUserSettings.actions=പ്രവർത്തനങ്ങൾ
-adminUserSettings.apiUser=പരിമിതമായ API ഉപയോക്താവ്
-adminUserSettings.extraApiUser=അധിക പരിമിതമായ API ഉപയോക്താവ്
-adminUserSettings.webOnlyUser=വെബ് മാത്രം ഉപയോക്താവ്
 adminUserSettings.demoUser=ഡെമോ ഉപയോക്താവ് (ഇഷ്ടാനുസൃത ക്രമീകരണങ്ങളില്ല)
 adminUserSettings.internalApiUser=ആന്തരിക API ഉപയോക്താവ്
 adminUserSettings.forceChange=ലോഗിൻ ചെയ്യുമ്പോൾ പാസ്വേഡ് മാറ്റാൻ ഉപയോക്താവിനെ നിർബന്ധിക്കുക
diff --git a/app/core/src/main/resources/messages_nl_NL.properties b/app/core/src/main/resources/messages_nl_NL.properties
index 9a1af6e0a..58e34a577 100644
--- a/app/core/src/main/resources/messages_nl_NL.properties
+++ b/app/core/src/main/resources/messages_nl_NL.properties
@@ -423,9 +423,6 @@ adminUserSettings.confirmChangeUserStatus=Should the user be disabled/enabled?
 adminUserSettings.usernameInfo=Gebruikersnaam kan alleen letters, nummers en de volgende speciale tekens @._+- bevatten of moet een geldig emailadres zijn.
 adminUserSettings.role=Rol
 adminUserSettings.actions=Acties
-adminUserSettings.apiUser=Beperkte API gebruiker
-adminUserSettings.extraApiUser=Extra beperkte API gebruiker
-adminUserSettings.webOnlyUser=Alleen web gebruiker
 adminUserSettings.demoUser=Demogebruiker (geen aangepaste instellingen)
 adminUserSettings.internalApiUser=Interne API gebruiker
 adminUserSettings.forceChange=Forceer gebruiker om gebruikersnaam/wachtwoord te wijzigen bij inloggen
diff --git a/app/core/src/main/resources/messages_no_NB.properties b/app/core/src/main/resources/messages_no_NB.properties
index 03d42816d..359bd2cad 100644
--- a/app/core/src/main/resources/messages_no_NB.properties
+++ b/app/core/src/main/resources/messages_no_NB.properties
@@ -423,9 +423,6 @@ adminUserSettings.confirmChangeUserStatus=Skal brukeren deaktiveres/aktiveres?
 adminUserSettings.usernameInfo=Brukernavn kan bare inneholde bokstaver, tall og følgende spesialtegn @._+- eller må være en gyldig e-postadresse.
 adminUserSettings.role=Rolle
 adminUserSettings.actions=Handlinger
-adminUserSettings.apiUser=Begrenset API Bruker
-adminUserSettings.extraApiUser=Ekstra Begrenset API Bruker
-adminUserSettings.webOnlyUser=Kun Web Bruker
 adminUserSettings.demoUser=Demo Bruker (Ingen tilpassede innstillinger)
 adminUserSettings.internalApiUser=Intern API Bruker
 adminUserSettings.forceChange=Tving bruker til å endre passord ved innlogging
diff --git a/app/core/src/main/resources/messages_pl_PL.properties b/app/core/src/main/resources/messages_pl_PL.properties
index 4963d7bc6..42f42cbc0 100644
--- a/app/core/src/main/resources/messages_pl_PL.properties
+++ b/app/core/src/main/resources/messages_pl_PL.properties
@@ -423,9 +423,6 @@ adminUserSettings.confirmChangeUserStatus=Czy użytkownik powinien zostać wył
 adminUserSettings.usernameInfo=Niewłaściwa nazwa użytkownika - musi zawierać litery, cyfry i @._+- LUB być adresem email.
 adminUserSettings.role=Rola
 adminUserSettings.actions=Akcje
-adminUserSettings.apiUser=Ograniczony Użytkownik API
-adminUserSettings.extraApiUser=Dodatkowy ograniczony Użytkownik API
-adminUserSettings.webOnlyUser=Użytkownik tylko WEB
 adminUserSettings.demoUser=Użytkownik DEMO
 adminUserSettings.internalApiUser=Wewnętrzny użytkownik API
 adminUserSettings.forceChange=Wymuś zmianę hasło po zalogowaniu
diff --git a/app/core/src/main/resources/messages_pt_BR.properties b/app/core/src/main/resources/messages_pt_BR.properties
index 552139b52..0053fe4e2 100644
--- a/app/core/src/main/resources/messages_pt_BR.properties
+++ b/app/core/src/main/resources/messages_pt_BR.properties
@@ -423,9 +423,6 @@ adminUserSettings.confirmChangeUserStatus=O usuário deve ser desabilitado/habil
 adminUserSettings.usernameInfo=Nome de usuário só pode incluir letras, números e os seguintes caracteres especiais @._+- ou deve ser um e-mail válido.
 adminUserSettings.role=Função
 adminUserSettings.actions=Ações
-adminUserSettings.apiUser=Usuário de API limitado
-adminUserSettings.extraApiUser=Usuário de API limitado adicional
-adminUserSettings.webOnlyUser=Usuário web apenas
 adminUserSettings.demoUser=Usuário demo (Sem configurações personalizadas)
 adminUserSettings.internalApiUser=Usuário de API interno
 adminUserSettings.forceChange=Forçar usuário a trocar a senha ao iniciar sessão
diff --git a/app/core/src/main/resources/messages_pt_PT.properties b/app/core/src/main/resources/messages_pt_PT.properties
index dc99a45c9..b171301cb 100644
--- a/app/core/src/main/resources/messages_pt_PT.properties
+++ b/app/core/src/main/resources/messages_pt_PT.properties
@@ -423,9 +423,6 @@ adminUserSettings.confirmChangeUserStatus=Deve o utilizador ser desativado/ativa
 adminUserSettings.usernameInfo=O nome de utilizador só pode conter letras, números e os seguintes caracteres especiais @._+- ou deve ser um endereço de email válido.
 adminUserSettings.role=Função
 adminUserSettings.actions=Ações
-adminUserSettings.apiUser=Utilizador API Limitado
-adminUserSettings.extraApiUser=Utilizador API Limitado Adicional
-adminUserSettings.webOnlyUser=Utilizador Apenas Web
 adminUserSettings.demoUser=Utilizador Demo (Sem Definições Personalizadas)
 adminUserSettings.internalApiUser=Utilizador API Interno
 adminUserSettings.forceChange=Forçar utilizador a alterar palavra-passe no login
diff --git a/app/core/src/main/resources/messages_ro_RO.properties b/app/core/src/main/resources/messages_ro_RO.properties
index 25bc477b1..dd6b768d2 100644
--- a/app/core/src/main/resources/messages_ro_RO.properties
+++ b/app/core/src/main/resources/messages_ro_RO.properties
@@ -423,9 +423,6 @@ adminUserSettings.confirmChangeUserStatus=Ar trebui dezactivat/activat utilizato
 adminUserSettings.usernameInfo=Numele de utilizator poate conține doar litere, numere și următoarele caractere speciale @._+- sau trebuie să fie o adresă de email validă.
 adminUserSettings.role=Rol
 adminUserSettings.actions=Acțiuni
-adminUserSettings.apiUser=Utilizator API Limitat
-adminUserSettings.extraApiUser=Utilizator API Limitat Suplimentar
-adminUserSettings.webOnlyUser=Utilizator Doar Web
 adminUserSettings.demoUser=Utilizator Demo (Fără setări personalizate)
 adminUserSettings.internalApiUser=Utilizator API Intern
 adminUserSettings.forceChange=Forțează utilizatorul să schimbe parola la conectare
diff --git a/app/core/src/main/resources/messages_ru_RU.properties b/app/core/src/main/resources/messages_ru_RU.properties
index e414408f1..331d91ba2 100644
--- a/app/core/src/main/resources/messages_ru_RU.properties
+++ b/app/core/src/main/resources/messages_ru_RU.properties
@@ -423,9 +423,6 @@ adminUserSettings.confirmChangeUserStatus=Отключить/включить п
 adminUserSettings.usernameInfo=Имя пользователя может содержать только буквы, цифры и следующие специальные символы @._+- или должно быть действительным адресом электронной почты.
 adminUserSettings.role=Роль
 adminUserSettings.actions=Действия
-adminUserSettings.apiUser=Ограниченный пользователь API
-adminUserSettings.extraApiUser=Дополнительный ограниченный пользователь API
-adminUserSettings.webOnlyUser=Только веб-пользователь
 adminUserSettings.demoUser=Демо-пользователь (без настраиваемых параметров)
 adminUserSettings.internalApiUser=Внутренний пользователь API
 adminUserSettings.forceChange=Требовать смену пароля при входе
diff --git a/app/core/src/main/resources/messages_sk_SK.properties b/app/core/src/main/resources/messages_sk_SK.properties
index 094265d29..04c9155d0 100644
--- a/app/core/src/main/resources/messages_sk_SK.properties
+++ b/app/core/src/main/resources/messages_sk_SK.properties
@@ -423,9 +423,6 @@ adminUserSettings.confirmChangeUserStatus=Should the user be disabled/enabled?
 adminUserSettings.usernameInfo=Používateľské meno musí obsahovať iba písmená a čísla, žiadne medzery alebo špeciálne znaky.
 adminUserSettings.role=Rola
 adminUserSettings.actions=Akcie
-adminUserSettings.apiUser=Obmedzený API používateľ
-adminUserSettings.extraApiUser=Ďalší obmedzený API používateľ
-adminUserSettings.webOnlyUser=Používateľ iba pre web
 adminUserSettings.demoUser=Demo používateľ (Bez vlastných nastavení)
 adminUserSettings.internalApiUser=Interný API používateľ
 adminUserSettings.forceChange=Donútiť používateľa zmeniť heslo pri prihlásení
diff --git a/app/core/src/main/resources/messages_sl_SI.properties b/app/core/src/main/resources/messages_sl_SI.properties
index f75e714af..2005f1f3e 100644
--- a/app/core/src/main/resources/messages_sl_SI.properties
+++ b/app/core/src/main/resources/messages_sl_SI.properties
@@ -423,9 +423,6 @@ adminUserSettings.confirmChangeUserStatus=Ali naj bo uporabnik onemogočen/omogo
 adminUserSettings.usernameInfo=Uporabniško ime lahko vsebuje samo črke, številke in naslednje posebne znake @._+- ali mora biti veljaven e-poštni naslov.
 adminUserSettings.role=Vloga
 adminUserSettings.actions=Dejanja
-adminUserSettings.apiUser=Omejen uporabnik API-ja
-adminUserSettings.extraApiUser=Dodatni omejeni uporabnik API-ja
-adminUserSettings.webOnlyUser=Samo spletni uporabnik
 adminUserSettings.demoUser=Demo uporabnik (brez nastavitev po meri)
 adminUserSettings.internalApiUser=Notranji uporabnik API-ja
 adminUserSettings.forceChange=Prisili uporabnika, da spremeni geslo ob prijavi
diff --git a/app/core/src/main/resources/messages_sr_LATN_RS.properties b/app/core/src/main/resources/messages_sr_LATN_RS.properties
index 809a785ee..34709d4b3 100644
--- a/app/core/src/main/resources/messages_sr_LATN_RS.properties
+++ b/app/core/src/main/resources/messages_sr_LATN_RS.properties
@@ -423,9 +423,6 @@ adminUserSettings.confirmChangeUserStatus=Da onemogućim/omogućim korisnika?
 adminUserSettings.usernameInfo=Korisničko ime može sadržati samo slova, brojeve i specijalne karaktere @._+- ili mora biti validna email adresa.
 adminUserSettings.role=Uloga
 adminUserSettings.actions=Akcije
-adminUserSettings.apiUser=Korisnik s ograničenim API pristupom
-adminUserSettings.extraApiUser=Dodatni ograničeni API korisnik
-adminUserSettings.webOnlyUser=Korisnik samo za web
 adminUserSettings.demoUser=Demo korisnik (Bez prilagođenih podešavanja)
 adminUserSettings.internalApiUser=Interni API korisnik
 adminUserSettings.forceChange=Prisili korisnika da promeni korisničko ime/lozinku pri prijavi
diff --git a/app/core/src/main/resources/messages_sv_SE.properties b/app/core/src/main/resources/messages_sv_SE.properties
index 086789fcd..4d23e9167 100644
--- a/app/core/src/main/resources/messages_sv_SE.properties
+++ b/app/core/src/main/resources/messages_sv_SE.properties
@@ -423,9 +423,6 @@ adminUserSettings.confirmChangeUserStatus=Ska användaren inaktiveras/aktiveras?
 adminUserSettings.usernameInfo=Användarnamn kan endast innehålla bokstäver, siffror och följande specialtecken @._+- eller måste vara en giltig e-postadress.
 adminUserSettings.role=Roll
 adminUserSettings.actions=Åtgärder
-adminUserSettings.apiUser=Begränsad API-användare
-adminUserSettings.extraApiUser=Ytterligare begränsad API-användare
-adminUserSettings.webOnlyUser=Endast webbanvändare
 adminUserSettings.demoUser=Demoanvändare (Inga anpassade inställningar)
 adminUserSettings.internalApiUser=Intern API-användare
 adminUserSettings.forceChange=Tvinga användare att ändra lösenord vid inloggning
diff --git a/app/core/src/main/resources/messages_th_TH.properties b/app/core/src/main/resources/messages_th_TH.properties
index 2637eadf2..2f8e596c8 100644
--- a/app/core/src/main/resources/messages_th_TH.properties
+++ b/app/core/src/main/resources/messages_th_TH.properties
@@ -423,9 +423,6 @@ adminUserSettings.confirmChangeUserStatus=ผู้ใช้นี้ควร
 adminUserSettings.usernameInfo=ชื่อผู้ใช้สามารถประกอบด้วยตัวอักษร ตัวเลข และอักขระพิเศษต่อไปนี้ @._+- หรือจะต้องเป็นที่อยู่อีเมลที่ถูกต้อง
 adminUserSettings.role=บทบาท
 adminUserSettings.actions=การดำเนินการ
-adminUserSettings.apiUser=ผู้ใช้ API จำกัด
-adminUserSettings.extraApiUser=ผู้ใช้ API เพิ่มเติม
-adminUserSettings.webOnlyUser=ผู้ใช้เว็บเท่านั้น
 adminUserSettings.demoUser=ผู้ใช้ทดลอง (ไม่มีการตั้งค่าปรับแต่ง)
 adminUserSettings.internalApiUser=ผู้ใช้ API ภายใน
 adminUserSettings.forceChange=บังคับให้ผู้ใช้เปลี่ยนรหัสผ่านในการเข้าสู่ระบบ
diff --git a/app/core/src/main/resources/messages_tr_TR.properties b/app/core/src/main/resources/messages_tr_TR.properties
index 2da6244ff..ffce96e3a 100644
--- a/app/core/src/main/resources/messages_tr_TR.properties
+++ b/app/core/src/main/resources/messages_tr_TR.properties
@@ -423,9 +423,6 @@ adminUserSettings.confirmChangeUserStatus=Kullanıcı devre dışı bırakılmal
 adminUserSettings.usernameInfo=Kullanıcı adı yalnızca harf, rakam ve aşağıdaki özel karakterleri @._+- içerebilir veya geçerli bir e-posta adresi olmalıdır.
 adminUserSettings.role=Rol
 adminUserSettings.actions=Eylemler
-adminUserSettings.apiUser=Sınırlı API Kullanıcısı
-adminUserSettings.extraApiUser=Ek Sınırlı API Kullanıcısı
-adminUserSettings.webOnlyUser=Sadece Web Kullanıcısı
 adminUserSettings.demoUser=Demo Kullanıcısı (Özel ayar yok)
 adminUserSettings.internalApiUser=Dahili API Kullanıcısı
 adminUserSettings.forceChange=Kullanıcının girişte kullanıcı adı/şifre değiştirmesini zorla
diff --git a/app/core/src/main/resources/messages_uk_UA.properties b/app/core/src/main/resources/messages_uk_UA.properties
index 89518dca8..35d5681c6 100644
--- a/app/core/src/main/resources/messages_uk_UA.properties
+++ b/app/core/src/main/resources/messages_uk_UA.properties
@@ -423,9 +423,6 @@ adminUserSettings.confirmChangeUserStatus=Чи потрібно вимкнути
 adminUserSettings.usernameInfo=Ім’я користувача може містити лише літери, цифри та наступні спеціальні символи @._+- або має бути дійсною електронною адресою.
 adminUserSettings.role=Роль
 adminUserSettings.actions=Дії
-adminUserSettings.apiUser=Обмежений користувач API
-adminUserSettings.extraApiUser=Додатковий обмежений користувач API
-adminUserSettings.webOnlyUser=Тільки веб-користувач
 adminUserSettings.demoUser=Демо-користувач (без налаштованих параметрів)
 adminUserSettings.internalApiUser=Внутрішній користувач API
 adminUserSettings.forceChange=Примусити користувача змінити пароль при вході в систему
diff --git a/app/core/src/main/resources/messages_vi_VN.properties b/app/core/src/main/resources/messages_vi_VN.properties
index dcf69cce8..2da9c3b26 100644
--- a/app/core/src/main/resources/messages_vi_VN.properties
+++ b/app/core/src/main/resources/messages_vi_VN.properties
@@ -423,9 +423,6 @@ adminUserSettings.confirmChangeUserStatus=Should the user be disabled/enabled?
 adminUserSettings.usernameInfo=Tên người dùng chỉ có thể chứa chữ cái, số và các ký tự đặc biệt sau @._+- hoặc phải là một địa chỉ email hợp lệ.
 adminUserSettings.role=Vai trò
 adminUserSettings.actions=Hành động
-adminUserSettings.apiUser=Người dùng API giới hạn
-adminUserSettings.extraApiUser=Người dùng API giới hạn bổ sung
-adminUserSettings.webOnlyUser=Chỉ người dùng web
 adminUserSettings.demoUser=Người dùng demo (Không có cài đặt tùy chỉnh)
 adminUserSettings.internalApiUser=Người dùng API nội bộ
 adminUserSettings.forceChange=Buộc người dùng thay đổi mật khẩu khi đăng nhập
diff --git a/app/core/src/main/resources/messages_zh_CN.properties b/app/core/src/main/resources/messages_zh_CN.properties
index 247b6ea70..c79b92380 100644
--- a/app/core/src/main/resources/messages_zh_CN.properties
+++ b/app/core/src/main/resources/messages_zh_CN.properties
@@ -423,9 +423,6 @@ adminUserSettings.confirmChangeUserStatus=是否应禁用/启用该用户？
 adminUserSettings.usernameInfo=用户名只能包含字母、数字和以下特殊字符@._+-，或者必须是有效的电子邮件地址。
 adminUserSettings.role=角色
 adminUserSettings.actions=操作
-adminUserSettings.apiUser=受限制的 API 用户
-adminUserSettings.extraApiUser=额外受限制的 API 用户
-adminUserSettings.webOnlyUser=仅限 Web 用户
 adminUserSettings.demoUser=演示用户(无自定义设置)
 adminUserSettings.internalApiUser=内部 API 用户
 adminUserSettings.forceChange=强制用户在登录时更改用户名/密码
diff --git a/app/core/src/main/resources/messages_zh_TW.properties b/app/core/src/main/resources/messages_zh_TW.properties
index bbd3cd495..1314913fc 100644
--- a/app/core/src/main/resources/messages_zh_TW.properties
+++ b/app/core/src/main/resources/messages_zh_TW.properties
@@ -423,9 +423,6 @@ adminUserSettings.confirmChangeUserStatus=是否要停用/啟用此使用者？
 adminUserSettings.usernameInfo=使用者名稱只能包含字母、數字和以下特殊字元 @._+- 或必須是有效的電子郵件地址。
 adminUserSettings.role=角色
 adminUserSettings.actions=操作
-adminUserSettings.apiUser=受限制的 API 使用者
-adminUserSettings.extraApiUser=額外受限制的 API 使用者
-adminUserSettings.webOnlyUser=僅網頁版使用者
 adminUserSettings.demoUser=示範使用者（無自訂設定）
 adminUserSettings.internalApiUser=內部 API 使用者
 adminUserSettings.forceChange=強制使用者在登入時變更密碼
diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/InitialSecuritySetup.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/InitialSecuritySetup.java
index 04965da27..3066e3ae3 100644
--- a/app/proprietary/src/main/java/stirling/software/proprietary/security/InitialSecuritySetup.java
+++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/InitialSecuritySetup.java
@@ -50,6 +50,7 @@ public class InitialSecuritySetup {
 
             userService.migrateOauth2ToSSO();
             migrateAdminRolesToSystemAdmin();
+            migrateDeprecatedRolesToUser();
             assignTeamsToDefaultOrganizationIfMissing();
             assignUsersToDefaultTeamIfMissing();
             initializeInternalApiUser();
@@ -217,4 +218,49 @@ public class InitialSecuritySetup {
                     migratedCount);
         }
     }
+
+    private void migrateDeprecatedRolesToUser() {
+        String[] deprecatedRoles = {
+            "ROLE_WEB_ONLY_USER", 
+            "ROLE_EXTRA_LIMITED_API_USER",
+            "ROLE_LIMITED_API_USER"
+        };
+
+        int totalMigrated = 0;
+        
+        for (String deprecatedRole : deprecatedRoles) {
+            List<User> usersWithDeprecatedRole = userService.findByRole(deprecatedRole);
+            
+            if (!usersWithDeprecatedRole.isEmpty()) {
+                log.info("Found {} users with role {}. Converting to USER...", 
+                        usersWithDeprecatedRole.size(), deprecatedRole);
+                
+                int migratedCount = 0;
+                for (User user : usersWithDeprecatedRole) {
+                    try {
+                        user.setUserRole(Role.USER);
+                        userService.saveUser(user);
+                        log.debug("Converted user '{}' from {} to USER", 
+                                user.getUsername(), deprecatedRole);
+                        migratedCount++;
+                    } catch (Exception e) {
+                        log.error("Failed to migrate user '{}' from {} to USER: {}",
+                                user.getUsername(), deprecatedRole, e.getMessage());
+                    }
+                }
+                
+                if (migratedCount > 0) {
+                    log.info("Successfully migrated {} users from {} to USER", 
+                            migratedCount, deprecatedRole);
+                    totalMigrated += migratedCount;
+                }
+            }
+        }
+        
+        if (totalMigrated == 0) {
+            log.debug("No users with deprecated roles found - migration not needed");
+        } else {
+            log.info("Total users migrated from deprecated roles to USER: {}", totalMigrated);
+        }
+    }
 }
diff --git a/app/proprietary/src/test/java/stirling/software/proprietary/security/service/UserServiceTest.java b/app/proprietary/src/test/java/stirling/software/proprietary/security/service/UserServiceTest.java
index be087314a..6621f86a6 100644
--- a/app/proprietary/src/test/java/stirling/software/proprietary/security/service/UserServiceTest.java
+++ b/app/proprietary/src/test/java/stirling/software/proprietary/security/service/UserServiceTest.java
@@ -286,7 +286,7 @@ class UserServiceTest {
         String username = "testuser";
         String password = "password123";
         Long teamId = 1L;
-        String customRole = Role.LIMITED_API_USER.getRoleId();
+        String customRole = Role.USER.getRoleId();
         String encodedPassword = "encodedPassword123";
 
         when(passwordEncoder.encode(password)).thenReturn(encodedPassword);