diff --git a/userfront/lib/features/auth/presentation/signup_screen.dart b/userfront/lib/features/auth/presentation/signup_screen.dart
index 715c993d..0a406182 100644
--- a/userfront/lib/features/auth/presentation/signup_screen.dart
+++ b/userfront/lib/features/auth/presentation/signup_screen.dart
@@ -316,9 +316,7 @@ class _SignupScreenState extends State<SignupScreen> {
         phone: _phoneController.text.trim(),
         affiliationType: _affiliationType,
         companyCode: _affiliationType == 'AFFILIATE' ? _companyCode : null,
-        department: _deptController.text.trim().isEmpty
-            ? (_affiliationType == 'GENERAL' ? 'External' : '')
-            : _deptController.text.trim(),
+        department: _deptController.text.trim(),
         termsAccepted: true,
       );
       if (mounted) _showSuccessDialog();
diff --git a/userfront/lib/features/dashboard/presentation/dashboard_screen.dart b/userfront/lib/features/dashboard/presentation/dashboard_screen.dart
index fc6a9767..87e58cdb 100644
--- a/userfront/lib/features/dashboard/presentation/dashboard_screen.dart
+++ b/userfront/lib/features/dashboard/presentation/dashboard_screen.dart
@@ -687,7 +687,7 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
           profile?.email ??
           profile?.phone ??
           tr('ui.userfront.profile.user_fallback', fallback: 'User');
-      final departmentValue = profile?.department ?? '';
+      final departmentValue = profile?.tenant?.name ?? profile?.department ?? '';
       final department = departmentValue.isNotEmpty
           ? departmentValue
           : tr('ui.userfront.profile.department_empty');