diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index 31ea724c0e94..a7b6bda1f817 100755
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -425,65 +425,64 @@ public function postBranding(ImageUploadRequest $request)
         if (! config('app.lock_passwords')) {
             $setting->site_name = $request->input('site_name');
             $setting->custom_css = $request->input('custom_css');
-        }
-
-        $setting = $request->handleImages($setting, 600, 'logo', '', 'logo');
+            $setting = $request->handleImages($setting, 600, 'logo', '', 'logo');
 
-        if ('1' == $request->input('clear_logo')) {
+            if ('1' == $request->input('clear_logo')) {
                 Storage::disk('public')->delete($setting->logo);
-            $setting->logo = null;
+                $setting->logo = null;
                 $setting->brand = 1;
-        }
-
-
-        $setting = $request->handleImages($setting, 600, 'email_logo', '', 'email_logo');
+            }
 
 
-       if ('1' == $request->input('clear_email_logo')) {
-            Storage::disk('public')->delete($setting->email_logo);
-            $setting->email_logo = null;
-            // If they are uploading an image, validate it and upload it
-        }
+            $setting = $request->handleImages($setting, 600, 'email_logo', '', 'email_logo');
 
 
-        $setting = $request->handleImages($setting, 600, 'label_logo', '', 'label_logo');
+            if ('1' == $request->input('clear_email_logo')) {
+                Storage::disk('public')->delete($setting->email_logo);
+                $setting->email_logo = null;
+                // If they are uploading an image, validate it and upload it
+            }
 
 
-        if ('1' == $request->input('clear_label_logo')) {
-            Storage::disk('public')->delete($setting->label_logo);
-            $setting->label_logo = null;
-        }
 
+            $setting = $request->handleImages($setting, 600, 'label_logo', '', 'label_logo');
 
-        // If the user wants to clear the favicon...
-         if ($request->hasFile('favicon')) {
-            $favicon_image = $favicon_upload = $request->file('favicon');
-            $favicon_ext = $favicon_image->getClientOriginalExtension();
-            $setting->favicon = $favicon_file_name = 'favicon-uploaded.'.$favicon_ext;
+            if ('1' == $request->input('clear_label_logo')) {
+                Storage::disk('public')->delete($setting->label_logo);
+                $setting->label_logo = null;
+            }
 
-            if (($favicon_image->getClientOriginalExtension() != 'ico') && ($favicon_image->getClientOriginalExtension() != 'svg')) {
-                $favicon_upload = Image::make($favicon_image->getRealPath())->resize(null, 36, function ($constraint) {
-                    $constraint->aspectRatio();
-                    $constraint->upsize();
-                });
+            
+            // If the user wants to clear the favicon...
+            if ($request->hasFile('favicon')) {
+                $favicon_image = $favicon_upload = $request->file('favicon');
+                $favicon_ext = $favicon_image->getClientOriginalExtension();
+                $setting->favicon = $favicon_file_name = 'favicon-uploaded.'.$favicon_ext;
+
+                if (($favicon_image->getClientOriginalExtension() != 'ico') && ($favicon_image->getClientOriginalExtension() != 'svg')) {
+                    $favicon_upload = Image::make($favicon_image->getRealPath())->resize(null, 36, function ($constraint) {
+                        $constraint->aspectRatio();
+                        $constraint->upsize();
+                    });
+
+                    // This requires a string instead of an object, so we use ($string)
+                    Storage::disk('public')->put($favicon_file_name, (string) $favicon_upload->encode());
+                } else {
+                    Storage::disk('public')->put($favicon_file_name, file_get_contents($request->file('favicon')));
+                }
 
-                // This requires a string instead of an object, so we use ($string)
-                Storage::disk('public')->put($favicon_file_name, (string) $favicon_upload->encode());
-            } else {
-                Storage::disk('public')->put($favicon_file_name, file_get_contents($request->file('favicon')));
-            }
 
+                // Remove Current image if exists
+                if (($setting->favicon) && (file_exists($favicon_file_name))) {
+                    Storage::disk('public')->delete($favicon_file_name);
+                }
+            } elseif ('1' == $request->input('clear_favicon')) {
+                Storage::disk('public')->delete($setting->clear_favicon);
+                $setting->favicon = null;
 
-            // Remove Current image if exists
-            if (($setting->favicon) && (file_exists($favicon_file_name))) {
-                Storage::disk('public')->delete($favicon_file_name);
+                // If they are uploading an image, validate it and upload it
             }
-        } elseif ('1' == $request->input('clear_favicon')) {
-             Storage::disk('public')->delete($setting->clear_favicon);
-            $setting->favicon = null;
-
-             // If they are uploading an image, validate it and upload it
-         }
+        }
 
         if ($setting->save()) {
             return redirect()->route('settings.index')
diff --git a/resources/views/partials/forms/edit/uploadLogo.blade.php b/resources/views/partials/forms/edit/uploadLogo.blade.php
index 5c48d9b3c4bf..38bfa31bf160 100644
--- a/resources/views/partials/forms/edit/uploadLogo.blade.php
+++ b/resources/views/partials/forms/edit/uploadLogo.blade.php
@@ -7,10 +7,10 @@
         </label>
     </div>
     <div class="col-md-9">
-        <label class="btn btn-default">
+        <label class="btn btn-default{{ (config('app.lock_passwords')) ? ' disabled' : '' }}">
             {{ trans('button.select_file')  }}
-            <input type="file" name="{{ $logoVariable }}" class="js-uploadFile" id="{{ $logoId }}" accept="image/gif,image/jpeg,image/webp,image/png,image/svg,image/svg+xml" data-maxsize="{{ $maxSize ?? Helper::file_upload_max_size() }}"
-                   style="display:none; max-width: 90%">
+            <input type="file" name="{{ $logoVariable }}" class="js-uploadFile" id="{{ $logoId }}" accept="{{ (isset($allowedTypes) ? $allowedTypes : "image/gif,image/jpeg,image/webp,image/png,image/svg,image/svg+xml") }}" data-maxsize="{{ $maxSize ?? Helper::file_upload_max_size() }}"
+                   style="display:none; max-width: 90%"{{ (config('app.lock_passwords')) ? ' disabled' : '' }}>
         </label>
 
         <span class='label label-default' id="{{ $logoId }}-info"></span>