diff --git a/jslib b/jslib
index e1d42f95..44b86f5d 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit e1d42f95d9c662bd4ffc8221bc4e5b9b96a095a6
+Subproject commit 44b86f5dd028271059b70a00d7878fbb1a06023f
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index cf6b0526..3b68d5ff 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -15,6 +15,7 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 
 import { AppComponent } from './app.component';
 
+import { CalloutComponent } from 'jslib/angular/components/callout.component';
 import { IconComponent } from 'jslib/angular/components/icon.component';
 import { ModalComponent } from 'jslib/angular/components/modal.component';
 
@@ -60,6 +61,7 @@ import { SearchCiphersPipe } from 'jslib/angular/pipes/search-ciphers.pipe';
         AutofocusDirective,
         BlurClickDirective,
         BoxRowDirective,
+        CalloutComponent,
         DashboardComponent,
         EnvironmentComponent,
         FallbackSrcDirective,
diff --git a/src/app/tabs/settings.component.html b/src/app/tabs/settings.component.html
index 45c053be..eca7acaf 100644
--- a/src/app/tabs/settings.component.html
+++ b/src/app/tabs/settings.component.html
@@ -35,54 +35,64 @@
                     </div>
                     <div class="form-group">
                         <div class="form-check">
-                            <input class="form-check-input" type="checkbox" id="ldapEncrypted" [(ngModel)]="ldap.ssl" name="Encrypted">
+                            <input class="form-check-input" type="checkbox" id="ldapEncrypted" [(ngModel)]="ldap.ssl"
+                                name="Encrypted">
                             <label class="form-check-label" for="ldapEncrypted">{{'ldapEncrypted' | i18n}}</label>
                         </div>
                     </div>
                     <div class="ml-4" *ngIf="ldap.ssl">
                         <div class="form-group">
                             <div class="form-radio">
-                                <input class="form-radio-input" type="radio"  [value]=true id="starttls" [(ngModel)]="ldap.starttls" name="StartTls">
-                                <label class="form-radio-label" for="starttls">{{'ldapTls' | i18n}}</label>
-                            </div>
-                            <div class="form-radio">
-                                <input class="form-radio-input" type="radio" [value]=false id="ssl" [(ngModel)]="ldap.starttls"  name="SSL">
+                                <input class="form-radio-input" type="radio" [value]="false" id="ssl"
+                                    [(ngModel)]="ldap.startTls" name="SSL">
                                 <label class="form-radio-label" for="ssl">{{'ldapSsl' | i18n}}</label>
                             </div>
+                            <div class="form-radio">
+                                <input class="form-radio-input" type="radio" [value]="true" id="startTls"
+                                    [(ngModel)]="ldap.startTls" name="StartTLS">
+                                <label class="form-radio-label" for="startTls">{{'ldapTls' | i18n}}</label>
+                            </div>
                         </div>
-                        <div class="ml-4" *ngIf="ldap.starttls">
+                        <div class="ml-4" *ngIf="ldap.startTls">
                             <p>{{'ldapTlsUntrustedDesc' | i18n}}</p>
                             <div class="form-group">
                                 <label for="tlsCaPath">{{'ldapTlsCa' | i18n}}</label>
                                 <input type="file" class="form-control-file mb-2" id="tlsCaPath_file"
-                                (change)="setSslPath('tlsCaPath')">
-                                <input type="text" class="form-control" id="tlsCaPath" name="TLSCaPath" [(ngModel)]="ldap.tlsCaPath"> 
+                                    (change)="setSslPath('tlsCaPath')">
+                                <input type="text" class="form-control" id="tlsCaPath" name="TLSCaPath"
+                                    [(ngModel)]="ldap.tlsCaPath">
                             </div>
                         </div>
-                        <div class="ml-4" *ngIf="!ldap.starttls">
+                        <div class="ml-4" *ngIf="!ldap.startTls">
                             <p>{{'ldapSslUntrustedDesc' | i18n}}</p>
                             <div class="form-group">
                                 <label for="sslCertPath">{{'ldapSslCert' | i18n}}</label>
                                 <input type="file" class="form-control-file mb-2" id="sslCertPath_file"
                                     (change)="setSslPath('sslCertPath')">
-                                <input type="text" class="form-control" id="sslCertPath" name="SSLCertPath" [(ngModel)]="ldap.sslCertPath">
+                                <input type="text" class="form-control" id="sslCertPath" name="SSLCertPath"
+                                    [(ngModel)]="ldap.sslCertPath">
                             </div>
                             <div class="form-group">
                                 <label for="sslKeyPath">{{'ldapSslKey' | i18n}}</label>
-                                <input type="file" class="form-control-file mb-2" id="sslKeyPath_file" (change)="setSslPath('sslKeyPath')">
-                                <input type="text" class="form-control" id="sslKeyPath" name="SSLKeyPath" [(ngModel)]="ldap.sslKeyPath">
+                                <input type="file" class="form-control-file mb-2" id="sslKeyPath_file"
+                                    (change)="setSslPath('sslKeyPath')">
+                                <input type="text" class="form-control" id="sslKeyPath" name="SSLKeyPath"
+                                    [(ngModel)]="ldap.sslKeyPath">
                             </div>
                             <div class="form-group">
                                 <label for="sslCaPath">{{'ldapSslCa' | i18n}}</label>
-                                <input type="file" class="form-control-file mb-2" id="sslCaPath_file" (change)="setSslPath('sslCaPath')">
-                                <input type="text" class="form-control" id="sslCaPath" name="SSLCaPath" [(ngModel)]="ldap.sslCaPath">
+                                <input type="file" class="form-control-file mb-2" id="sslCaPath_file"
+                                    (change)="setSslPath('sslCaPath')">
+                                <input type="text" class="form-control" id="sslCaPath" name="SSLCaPath"
+                                    [(ngModel)]="ldap.sslCaPath">
                             </div>
                         </div>
                         <div class="form-group">
                             <div class="form-check">
                                 <input class="form-check-input" type="checkbox" id="certDoNotVerify"
                                     [(ngModel)]="ldap.sslAllowUnauthorized" name="CertDoNoVerify">
-                                <label class="form-check-label" for="certDoNotVerify">{{'ldapCertDoNotVerify' | i18n}}</label>
+                                <label class="form-check-label"
+                                    for="certDoNotVerify">{{'ldapCertDoNotVerify' | i18n}}</label>
                             </div>
                         </div>
                     </div>
diff --git a/src/models/ldapConfiguration.ts b/src/models/ldapConfiguration.ts
index e41b6dc1..f34246b5 100644
--- a/src/models/ldapConfiguration.ts
+++ b/src/models/ldapConfiguration.ts
@@ -1,6 +1,6 @@
 export class LdapConfiguration {
     ssl = false;
-    starttls = true;
+    startTls = false;
     tlsCaPath: string;
     sslAllowUnauthorized = false;
     sslCertPath: string;
diff --git a/src/services/ldap-directory.service.ts b/src/services/ldap-directory.service.ts
index d267ddf9..dc3439bf 100644
--- a/src/services/ldap-directory.service.ts
+++ b/src/services/ldap-directory.service.ts
@@ -324,7 +324,7 @@ export class LdapDirectoryService implements DirectoryService {
                 reject(this.i18nService.t('dirConfigIncomplete'));
                 return;
             }
-            const protocol = 'ldap' + (this.dirConfig.ssl && !this.dirConfig.starttls ? 's' : '');
+            const protocol = 'ldap' + (this.dirConfig.ssl && !this.dirConfig.startTls ? 's' : '');
             const url = protocol + '://' + this.dirConfig.hostname +
                 ':' + this.dirConfig.port;
             const options: ldap.ClientOptions = {
@@ -333,7 +333,10 @@ export class LdapDirectoryService implements DirectoryService {
 
             const tlsOptions: any = {};
             if (this.dirConfig.ssl) {
-                if (!this.dirConfig.starttls) {
+                if (this.dirConfig.sslAllowUnauthorized) {
+                    tlsOptions.rejectUnauthorized = !this.dirConfig.sslAllowUnauthorized;
+                }
+                if (!this.dirConfig.startTls) {
                     if (this.dirConfig.sslCaPath != null && this.dirConfig.sslCaPath !== '' &&
                         fs.existsSync(this.dirConfig.sslCaPath)) {
                         tlsOptions.ca = [fs.readFileSync(this.dirConfig.sslCaPath)];
@@ -352,9 +355,6 @@ export class LdapDirectoryService implements DirectoryService {
                         tlsOptions.ca = [fs.readFileSync(this.dirConfig.tlsCaPath)];
                     }
                 }
-                if (this.dirConfig.sslAllowUnauthorized) {
-                    tlsOptions.rejectUnauthorized = !this.dirConfig.sslAllowUnauthorized;
-                }
             }
 
             if (Object.keys(tlsOptions).length > 0) {
@@ -373,14 +373,14 @@ export class LdapDirectoryService implements DirectoryService {
                 return;
             }
 
-            if (this.dirConfig.starttls && this.dirConfig.ssl) {
+            if (this.dirConfig.startTls && this.dirConfig.ssl) {
                 this.client.starttls(options.tlsOptions, undefined, (err, res) => {
                     if (err != null) {
                         reject(err.message);
                     } else {
-                        this.client.bind(user, pass, (err) => {
-                            if (err != null) {
-                                reject(err.message);
+                        this.client.bind(user, pass, (err2) => {
+                            if (err2 != null) {
+                                reject(err2.message);
                             } else {
                                 resolve();
                             }