diff --git a/lib/core/blocs/session/session_cubit.dart b/lib/core/blocs/session/session_cubit.dart
index bcf6356..5060f53 100644
--- a/lib/core/blocs/session/session_cubit.dart
+++ b/lib/core/blocs/session/session_cubit.dart
@@ -121,6 +121,8 @@ class SessionCubit extends Cubit<SessionState> {
         await _prefs.setString(_lastStoreKey, activeStore.id!);
       }
 
+      setIsSingleUserMode(_prefs.getBool('isSingleUserMode') ?? false);
+
       // 4. BENVENUTO A BORDO
       emit(
         state.copyWith(
diff --git a/lib/features/settings/settings_screen.dart b/lib/features/settings/settings_screen.dart
index 85a13c5..1194532 100644
--- a/lib/features/settings/settings_screen.dart
+++ b/lib/features/settings/settings_screen.dart
@@ -25,14 +25,20 @@ class SettingsScreen extends StatelessWidget {
               context: context,
               onTap: () {},
             ),
+            const Divider(height: 30),
             BlocBuilder<SettingsCubit, SettingsState>(
               builder: (context, state) => CheckboxListTile(
                 value: state.isSingleUserMode,
-                title: const Text('Singolo Utente'),
-                onChanged: (_) =>
-                    context.read<SettingsCubit>().toggleSingleUserMode(),
+                title: const Text(
+                  'Modalità utente singolo (dispositivo personale)',
+                ),
+                onChanged: (value) {
+                  context.read<SessionCubit>().setIsSingleUserMode(value!);
+                  context.read<SettingsCubit>().toggleSingleUserMode();
+                },
               ),
             ),
+            const Divider(height: 30),
             _settingsTile(
               title: 'Impostazioni Azienda',
               icon: Icons.business,