diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index 942306516d..30f97ac07f 100755
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -916,29 +916,32 @@ class SettingsController extends Controller
             return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));
         }
 
-        $setting->ldap_enabled            = $request->input('ldap_enabled', '0');
-        $setting->ldap_server             = $request->input('ldap_server');
-        $setting->ldap_server_cert_ignore = $request->input('ldap_server_cert_ignore', false);
-        $setting->ldap_uname              = $request->input('ldap_uname');
-        if ($request->input('ldap_pword') !== '') {
-            $setting->ldap_pword = Crypt::encrypt($request->input('ldap_pword'));
+        if (!config('app.lock_passwords')===true) {
+            $setting->ldap_enabled            = $request->input('ldap_enabled', '0');
+            $setting->ldap_server             = $request->input('ldap_server');
+            $setting->ldap_server_cert_ignore = $request->input('ldap_server_cert_ignore', false);
+            $setting->ldap_uname              = $request->input('ldap_uname');
+            if ($request->input('ldap_pword') !== '') {
+                $setting->ldap_pword = Crypt::encrypt($request->input('ldap_pword'));
+            }
+            $setting->ldap_basedn            = $request->input('ldap_basedn');
+            $setting->ldap_filter            = $request->input('ldap_filter');
+            $setting->ldap_username_field    = $request->input('ldap_username_field');
+            $setting->ldap_lname_field       = $request->input('ldap_lname_field');
+            $setting->ldap_fname_field       = $request->input('ldap_fname_field');
+            $setting->ldap_auth_filter_query = $request->input('ldap_auth_filter_query');
+            $setting->ldap_version           = $request->input('ldap_version');
+            $setting->ldap_active_flag       = $request->input('ldap_active_flag');
+            $setting->ldap_emp_num           = $request->input('ldap_emp_num');
+            $setting->ldap_email             = $request->input('ldap_email');
+            $setting->ad_domain              = $request->input('ad_domain');
+            $setting->is_ad                  = $request->input('is_ad', '0');
+            $setting->ad_append_domain       = $request->input('ad_append_domain', '0');
+            $setting->ldap_tls               = $request->input('ldap_tls', '0');
+            $setting->ldap_pw_sync           = $request->input('ldap_pw_sync', '0');
+            $setting->custom_forgot_pass_url = $request->input('custom_forgot_pass_url');
+
         }
-        $setting->ldap_basedn            = $request->input('ldap_basedn');
-        $setting->ldap_filter            = $request->input('ldap_filter');
-        $setting->ldap_username_field    = $request->input('ldap_username_field');
-        $setting->ldap_lname_field       = $request->input('ldap_lname_field');
-        $setting->ldap_fname_field       = $request->input('ldap_fname_field');
-        $setting->ldap_auth_filter_query = $request->input('ldap_auth_filter_query');
-        $setting->ldap_version           = $request->input('ldap_version');
-        $setting->ldap_active_flag       = $request->input('ldap_active_flag');
-        $setting->ldap_emp_num           = $request->input('ldap_emp_num');
-        $setting->ldap_email             = $request->input('ldap_email');
-        $setting->ad_domain              = $request->input('ad_domain');
-        $setting->is_ad                  = $request->input('is_ad', '0');
-        $setting->ad_append_domain       = $request->input('ad_append_domain', '0');
-        $setting->ldap_tls               = $request->input('ldap_tls', '0');
-        $setting->ldap_pw_sync           = $request->input('ldap_pw_sync', '0');
-        $setting->custom_forgot_pass_url = $request->input('custom_forgot_pass_url');
 
         if ($setting->save()) {
             return redirect()->route('settings.ldap.index')