diff --git a/pages/Settings.tsx b/pages/Settings.tsx
index aa2fee7..f8d4688 100644
--- a/pages/Settings.tsx
+++ b/pages/Settings.tsx
@@ -278,10 +278,13 @@ export const SettingsPage: React.FC = () => {
       tabs.push({ id: 'features', label: 'Funzionalità', icon: <LayoutGrid className="w-4 h-4"/> });
   }
   if (isPrivileged) {
-      tabs.push(
-          { id: 'general', label: 'Condominio', icon: <Building className="w-4 h-4"/> },
-          { id: 'storage', label: 'Cloud & Storage', icon: <HardDrive className="w-4 h-4"/> }
-      );
+      tabs.push({ id: 'general', label: 'Condominio', icon: <Building className="w-4 h-4"/> });
+      
+      // Only show Storage tab if Documents feature is enabled
+      if (globalSettings?.features.documents) {
+          tabs.push({ id: 'storage', label: 'Cloud & Storage', icon: <HardDrive className="w-4 h-4"/> });
+      }
+
       if (globalSettings?.features.multiCondo) {
           tabs.push({ id: 'condos', label: 'Lista Condomini', icon: <List className="w-4 h-4"/> });
       }
@@ -419,8 +422,8 @@ export const SettingsPage: React.FC = () => {
                 </div>
             )}
 
-            {/* STORAGE CONFIG TAB */}
-            {isPrivileged && activeTab === 'storage' && (
+            {/* STORAGE CONFIG TAB - CONDITIONAL */}
+            {isPrivileged && activeTab === 'storage' && globalSettings?.features.documents && (
                 <div className="animate-fade-in bg-white rounded-xl shadow-sm border border-slate-200 p-6">
                     <h3 className="text-lg font-bold text-slate-800 mb-4 flex items-center gap-2"><Cloud className="w-5 h-5 text-blue-600" /> Configurazione Storage</h3>
                     <p className="text-sm text-slate-500 mb-6">Scegli dove salvare i documenti caricati.</p>
@@ -498,7 +501,7 @@ export const SettingsPage: React.FC = () => {
                                 <div className="grid grid-cols-2 gap-4"><div><label className="block text-xs font-bold text-slate-500 uppercase mb-1">Civico</label><input type="text" value={activeCondo.streetNumber || ''} onChange={(e) => setActiveCondo({ ...activeCondo, streetNumber: e.target.value })} className="w-full border p-2.5 rounded-lg text-slate-700" required/></div><div><label className="block text-xs font-bold text-slate-500 uppercase mb-1">CAP</label><input type="text" value={activeCondo.zipCode || ''} onChange={(e) => setActiveCondo({ ...activeCondo, zipCode: e.target.value })} className="w-full border p-2.5 rounded-lg text-slate-700"/></div></div>
                                 <div className="grid grid-cols-2 gap-4"><div><label className="block text-xs font-bold text-slate-500 uppercase mb-1">Città</label><input type="text" value={activeCondo.city || ''} onChange={(e) => setActiveCondo({ ...activeCondo, city: e.target.value })} className="w-full border p-2.5 rounded-lg text-slate-700" required/></div><div><label className="block text-xs font-bold text-slate-500 uppercase mb-1">Provincia</label><input type="text" value={activeCondo.province || ''} onChange={(e) => setActiveCondo({ ...activeCondo, province: e.target.value })} className="w-full border p-2.5 rounded-lg text-slate-700" required/></div></div>
                                 <div><label className="block text-xs font-bold text-slate-500 uppercase mb-1">Note (Opzionali)</label><textarea value={activeCondo.notes || ''} onChange={(e) => setActiveCondo({ ...activeCondo, notes: e.target.value })} className="w-full border p-2.5 rounded-lg text-slate-700 h-24"></textarea></div>
-                                {globalSettings?.features.payPal && (<div className="bg-blue-50 p-4 rounded-lg border border-blue-100"><div className="flex items-center gap-2 mb-2 text-blue-800"><CreditCard className="w-4 h-4"/><span className="text-xs font-bold uppercase">Configurazione Pagamenti</span></div><div><label className="text-xs font-semibold text-slate-600 block mb-1">PayPal Client ID</label><input className="w-full border p-2 rounded text-slate-700 text-sm" placeholder="Es: Afg..." value={activeCondo.paypalClientId || ''} onChange={e => setActiveCondo({...activeCondo, paypalClientId: e.target.value})} /><p className="text-[10px] text-slate-500 mt-1">Necessario per abilitare i pagamenti online delle rate.</p></div></div>)}
+                                {globalSettings?.features.payPal && (<div className="bg-blue-50 p-4 rounded-lg border border-blue-100"><div className="flex items-center gap-2 mb-2 text-blue-800"><CreditCard className="w-4 h-4"/><span className="text-xs font-bold uppercase">Configurazione Pagamenti</span></div><div><label className="text-xs font-semibold text-slate-600 block mb-1">PayPal Client ID</label><input type="password" className="w-full border p-2 rounded text-slate-700 text-sm" placeholder="Es: Afg..." value={activeCondo.paypalClientId || ''} onChange={e => setActiveCondo({...activeCondo, paypalClientId: e.target.value})} /><p className="text-[10px] text-slate-500 mt-1">Necessario per abilitare i pagamenti online delle rate.</p></div></div>)}
                                 
                                 <div className="flex gap-4">
                                     <div className="flex-1">
@@ -680,7 +683,7 @@ export const SettingsPage: React.FC = () => {
                               </div>
                               <div>
                                   <label className="text-xs font-semibold text-slate-600 block mb-1">PayPal Client ID (REST API App)</label>
-                                  <input className="w-full border p-2 rounded text-slate-700 text-sm" placeholder="Es: Afg..." value={condoForm.paypalClientId} onChange={e => setCondoForm({...condoForm, paypalClientId: e.target.value})} />
+                                  <input type="password" className="w-full border p-2 rounded text-slate-700 text-sm" placeholder="Es: Afg..." value={condoForm.paypalClientId} onChange={e => setCondoForm({...condoForm, paypalClientId: e.target.value})} />
                                   <p className="text-[10px] text-slate-500 mt-1">Necessario per abilitare i pagamenti online delle rate.</p>
                               </div>
                           </div>