diff --git a/app/app.vue b/app/app.vue
index 22343bae6..c653f5530 100644
--- a/app/app.vue
+++ b/app/app.vue
@@ -22,12 +22,7 @@ useHead({
         lang: 'en',
     },
     meta: [{ key: 'theme-color', name: 'theme-color', content: color }],
-    titleTemplate: (title?: string) => {
-        if (title?.includes('.')) {
-            title = t(title);
-        }
-        return title ? `${title} - FiveNet` : 'FiveNet';
-    },
+    titleTemplate: (title?: string) => (title ? `${title?.includes('.') ? t(title) : title} - FiveNet` : 'FiveNet'),
 });
 
 useSeoMeta({
@@ -82,12 +77,14 @@ async function clickListener(event: MouseEvent): Promise<void> {
     });
 }
 
-onBeforeMount(async () => {
+async function setUserLocale(): Promise<void> {
     logger.info('Setting user locale to', userLocale.value);
-    if (userLocale.value !== null) {
+    if (userLocale.value !== undefined) {
         await setLocale(userLocale.value);
     }
-});
+}
+setUserLocale();
+watch(userLocale, () => setUserLocale());
 
 onMounted(async () => {
     if (!import.meta.client) {
diff --git a/app/components/citizens/info/CitizenInfo.vue b/app/components/citizens/info/CitizenInfo.vue
index a799877b8..54b17ab5a 100644
--- a/app/components/citizens/info/CitizenInfo.vue
+++ b/app/components/citizens/info/CitizenInfo.vue
@@ -171,7 +171,7 @@ const isOpen = ref(false);
                             <div class="inline-flex gap-2">
                                 <UBadge>
                                     {{ user.jobLabel }}
-                                    <template v-if="user.jobGrade > 0 && user.job !== game.unemployedJobName">
+                                    <template v-if="user.job !== game.unemployedJobName">
                                         ({{ $t('common.rank') }}: {{ user.jobGradeLabel }})
                                     </template>
                                     {{ user.props?.jobName || user.props?.jobGradeNumber ? '*' : '' }}
diff --git a/app/components/jobs/colleagues/ColleagueInfoPopover.vue b/app/components/jobs/colleagues/ColleagueInfoPopover.vue
index f122a254c..740e342e9 100644
--- a/app/components/jobs/colleagues/ColleagueInfoPopover.vue
+++ b/app/components/jobs/colleagues/ColleagueInfoPopover.vue
@@ -57,6 +57,8 @@ async function getCitizen(id: number): Promise<Colleague> {
 
 const user = computed(() => data.value || props.user);
 
+const { game } = useAppConfig();
+
 const opened = ref(false);
 watchOnce(opened, async () => {
     if (props.user) {
@@ -176,7 +178,9 @@ watchOnce(opened, async () => {
                         <p v-if="user.jobLabel" class="text-sm font-normal">
                             <span class="font-semibold">{{ $t('common.job') }}:</span>
                             {{ user.jobLabel }}
-                            <span v-if="user.jobGrade > 0 && user.jobGradeLabel"> ({{ user.jobGradeLabel }})</span>
+                            <template v-if="user.jobGradeLabel && user.job !== game.unemployedJobName">
+                                ({{ $t('common.rank') }}: {{ user.jobGradeLabel }})
+                            </template>
                         </p>
 
                         <p v-if="user.dateofbirth" class="text-sm font-normal">
diff --git a/app/components/jobs/colleagues/ColleaguesList.vue b/app/components/jobs/colleagues/ColleaguesList.vue
index a255f7c69..5f172b035 100644
--- a/app/components/jobs/colleagues/ColleaguesList.vue
+++ b/app/components/jobs/colleagues/ColleaguesList.vue
@@ -173,6 +173,8 @@ const columns = [
         : undefined,
 ].filter((c) => c !== undefined) as { key: string; label: string; sortable?: boolean }[];
 
+const { game } = useAppConfig();
+
 const input = useTemplateRef('input');
 
 defineShortcuts({
@@ -381,13 +383,15 @@ defineShortcuts({
                 <dl class="font-normal lg:hidden">
                     <dt class="sr-only">{{ $t('common.job_grade') }}</dt>
                     <dd class="mt-1 truncate">
-                        {{ colleague.jobGradeLabel }}<span v-if="colleague.jobGrade > 0"> ({{ colleague.jobGrade }})</span>
+                        {{ colleague.jobGradeLabel }}
+                        <template v-if="colleague.job !== game.unemployedJobName"> ({{ colleague.jobGrade }})</template>
                     </dd>
                 </dl>
             </template>
 
             <template #rank-data="{ row: colleague }">
-                {{ colleague.jobGradeLabel }}<span v-if="colleague.jobGrade > 0"> ({{ colleague.jobGrade }})</span>
+                {{ colleague.jobGradeLabel }}
+                <template v-if="colleague.job !== game.unemployedJobName"> ({{ colleague.jobGrade }})</template>
             </template>
 
             <template #absence-data="{ row: colleague }">
@@ -500,8 +504,10 @@ defineShortcuts({
                     <template #description>
                         <div class="flex flex-col gap-1">
                             <span>
-                                {{ colleague.jobGradeLabel
-                                }}<span v-if="colleague.jobGrade > 0"> ({{ colleague.jobGrade }})</span>
+                                {{ colleague.jobGradeLabel }}
+                                <template v-if="colleague.job !== game.unemployedJobName">
+                                    ({{ colleague.jobGrade }})
+                                </template>
                             </span>
 
                             <PhoneNumberBlock :number="colleague.phoneNumber" />
diff --git a/app/components/jobs/colleagues/info/ColleagueInfo.vue b/app/components/jobs/colleagues/info/ColleagueInfo.vue
index 811b0fb6b..3946a81f1 100644
--- a/app/components/jobs/colleagues/info/ColleagueInfo.vue
+++ b/app/components/jobs/colleagues/info/ColleagueInfo.vue
@@ -19,6 +19,8 @@ defineEmits<{
 const modal = useModal();
 
 const { attr, can, activeChar } = useAuth();
+
+const { game } = useAppConfig();
 </script>
 
 <template>
@@ -38,11 +40,11 @@ const { attr, can, activeChar } = useAuth();
             </div>
 
             <div class="inline-flex flex-col gap-2 lg:flex-row">
-                <UBadge>
+                <UBadge class="truncate">
                     {{ colleague.jobLabel }}
-                    <span v-if="colleague.jobGrade > 0" class="ml-1 truncate">
-                        ({{ $t('common.rank') }}: {{ colleague.jobGradeLabel }})</span
-                    >
+                    <template v-if="colleague.job !== game.unemployedJobName">
+                        ({{ $t('common.rank') }}: {{ colleague.jobGradeLabel }})
+                    </template>
                 </UBadge>
 
                 <UBadge
diff --git a/app/components/jobs/timeclock/TimeclockInactiveList.vue b/app/components/jobs/timeclock/TimeclockInactiveList.vue
index fd8858b80..f3c8ba7db 100644
--- a/app/components/jobs/timeclock/TimeclockInactiveList.vue
+++ b/app/components/jobs/timeclock/TimeclockInactiveList.vue
@@ -109,6 +109,8 @@ const columns = [
         permission: 'JobsService.GetColleague' as Perms,
     },
 ].filter((c) => c.permission === undefined || can(c.permission).value);
+
+const { game } = useAppConfig();
 </script>
 
 <template>
@@ -170,13 +172,15 @@ const columns = [
             <dl class="font-normal lg:hidden">
                 <dt class="sr-only">{{ $t('common.job_grade') }}</dt>
                 <dd class="mt-1 truncate">
-                    {{ colleague.jobGradeLabel }}<span v-if="colleague.jobGrade > 0"> ({{ colleague.jobGrade }})</span>
+                    {{ colleague.jobGradeLabel }}
+                    <template v-if="colleague.job !== game.unemployedJobName"> ({{ colleague.jobGrade }}) </template>
                 </dd>
             </dl>
         </template>
 
         <template #rank-data="{ row: colleague }">
-            {{ colleague.jobGradeLabel }}<span v-if="colleague.jobGrade > 0"> ({{ colleague.jobGrade }})</span>
+            {{ colleague.jobGradeLabel }}
+            <template v-if="colleague.job !== game.unemployedJobName"> ({{ colleague.jobGrade }}) </template>
         </template>
 
         <template #phoneNumber-data="{ row: colleague }">
diff --git a/app/components/jobs/timeclock/TimeclockList.vue b/app/components/jobs/timeclock/TimeclockList.vue
index 301250ca4..41491bb13 100644
--- a/app/components/jobs/timeclock/TimeclockList.vue
+++ b/app/components/jobs/timeclock/TimeclockList.vue
@@ -314,6 +314,8 @@ const selectedMode = computed({
         query.mode = timeRangeModes.value[value]?.mode ?? TimeclockMode.DAILY;
     },
 });
+
+const { game } = useAppConfig();
 </script>
 
 <template>
@@ -599,7 +601,8 @@ const selectedMode = computed({
         </template>
 
         <template #rank-data="{ row: entry }">
-            {{ entry.user.jobGradeLabel }}<span v-if="entry.user.jobGrade > 0"> ({{ entry.user.jobGrade }})</span>
+            {{ entry.user.jobGradeLabel }}
+            <template v-if="entry.user.job !== game.unemployedJobName"> ({{ entry.user.jobGrade }})</template>
         </template>
 
         <template #time-data="{ row: entry }">
diff --git a/app/components/partials/LanguageSwitcherModal.vue b/app/components/partials/LanguageSwitcherModal.vue
index 5c16a0003..8bfbc456c 100644
--- a/app/components/partials/LanguageSwitcherModal.vue
+++ b/app/components/partials/LanguageSwitcherModal.vue
@@ -37,8 +37,8 @@ async function switchLanguage(lang: LocaleObject): Promise<void> {
         return;
     }
 
-    useLogger('⚙️ Settings').info('Switching language to:', lang.code);
     preventClose.value = true;
+    useLogger('⚙️ Settings').info('Switching language to:', lang.code);
 
     userLocale.value = lang.code;
 
@@ -46,7 +46,7 @@ async function switchLanguage(lang: LocaleObject): Promise<void> {
         title: { key: 'notifications.language_switched.title', parameters: {} },
         description: { key: 'notifications.language_switched.content', parameters: { name: lang.name ?? lang.code } },
         type: NotificationType.SUCCESS,
-        timeout: 1750,
+        timeout: 1650,
         callback: () => reloadNuxtApp({ persistState: false, force: true }),
     });
 }
diff --git a/app/store/settings.ts b/app/store/settings.ts
index 91fd1ca06..bd33cd940 100644
--- a/app/store/settings.ts
+++ b/app/store/settings.ts
@@ -6,7 +6,7 @@ export const logger = useLogger('⚙️ Settings');
 export interface SettingsState {
     updateAvailable: false | string;
     version: string;
-    locale: Locale | null;
+    locale: Locale | undefined;
 
     nuiEnabled: boolean;
     nuiResourceName: string | undefined;
diff --git a/nuxt.config.ts b/nuxt.config.ts
index ecc54b8a0..177d2fb84 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -135,7 +135,8 @@ export default defineNuxtConfig({
         build: {
             terserOptions: {
                 compress: {
-                    drop_console: true,
+                    // Only drop certain console log calls
+                    drop_console: ['trace', 'debug', 'info'],
                     drop_debugger: true,
                 },
             },