diff --git a/index.html b/index.html
index 97fd6ef..e1fad59 100644
--- a/index.html
+++ b/index.html
@@ -267,16 +267,6 @@
                             <div class="setting-description">This name will be used in your greeting message</div>
                         <input type="text" id="settings-name" placeholder="Enter your name">
                     </div>
-                    <div class="setting-item horizontal">
-                            <div>
-                        <div class="setting-label">Anonymous Mode</div>
-                                <div class="setting-description">Hide your real name and use a randomly generated one</div>
-                            </div>
-                        <label class="toggle">
-                            <input type="checkbox" id="toggle-anonymous">
-                            <span class="toggle-slider"></span>
-                        </label>
-                    </div>
                 </div>
 
                     <div class="settings-card">
@@ -631,7 +621,7 @@
                                 <div class="setting-description">Hide your real name and use a randomly generated one</div>
                             </div>
                             <label class="toggle">
-                                <input type="checkbox" id="toggle-anonymous-privacy">
+                                <input type="checkbox" id="toggle-anonymous">
                                 <span class="toggle-slider"></span>
                             </label>
                         </div>
diff --git a/js/backgrounds.js b/js/backgrounds.js
index fe9a249..988d24f 100644
--- a/js/backgrounds.js
+++ b/js/backgrounds.js
@@ -1,5 +1,5 @@
 document.addEventListener('DOMContentLoaded', () => {
-    const MAX_IMAGE_SIZE_MB = 1.5;
+    const MAX_IMAGE_SIZE_MB = 5;
     const MAX_USER_BACKGROUNDS = 10;
 
     const backgroundUpload = document.getElementById('background-upload');
diff --git a/js/settings.js b/js/settings.js
index 2858ff8..ed95d3e 100644
--- a/js/settings.js
+++ b/js/settings.js
@@ -765,11 +765,9 @@ const settings = {
             });
 
             if (data.settings.passwordProtectionEnabled) {
-                setTimeout(() => {
-                    if (typeof shortcuts.createShortcutProtectionManager === 'function') {
-                        shortcuts.createShortcutProtectionManager();
-                    }
-                }, 100);
+                if (typeof shortcuts.createShortcutProtectionManager === 'function') {
+                    shortcuts.createShortcutProtectionManager();
+                }
             }
 
             Storage.set('shortcuts', data.shortcuts);
diff --git a/js/shortcuts.js b/js/shortcuts.js
index e9d4031..d1db36c 100644
--- a/js/shortcuts.js
+++ b/js/shortcuts.js
@@ -414,6 +414,12 @@ const shortcuts = {
                 if (passwordSettings) {
                     if (isEnabled) {
                         passwordSettings.classList.remove('hidden');
+                        const masterPasswordInput = document.getElementById('master-password');
+                        if (masterPasswordInput) {
+                            setTimeout(() => {
+                                masterPasswordInput.focus();
+                            }, 10);
+                        }
                     } else {
                         passwordSettings.classList.add('hidden');
                     }
@@ -432,10 +438,7 @@ const shortcuts = {
                         }
                     } else {
                         notifications.show('Password protection enabled!', 'success');
-                        
-                        setTimeout(() => {
-                            shortcuts.createShortcutProtectionManager();
-                        }, 10);
+                        shortcuts.createShortcutProtectionManager();
                     }
                 } else {
                     const currentShortcuts = Storage.get('shortcuts') || [];
@@ -476,13 +479,9 @@ const shortcuts = {
                             }
                             shortcuts.updateAddShortcutModal();
                             
-                            setTimeout(() => {
-                                shortcuts.createShortcutProtectionManager();
-                            }, 10);
+                            shortcuts.createShortcutProtectionManager();
                         } else {
-                            setTimeout(() => {
-                                shortcuts.createShortcutProtectionManager();
-                            }, 10);
+                            shortcuts.createShortcutProtectionManager();
                         }
                     } else {
                         notifications.show('Please enter a valid password!', 'error');