diff --git a/.swiftlint.yml b/.swiftlint.yml
index a3bb63c..a4d4c2d 100644
--- a/.swiftlint.yml
+++ b/.swiftlint.yml
@@ -221,6 +221,8 @@ closure_body_length:
 identifier_name:
   excluded: ["id", "to", "Defaults"]
   allowed_symbols: ["_"]
+multiline_arguments:
+  only_enforce_after_first_closure_on_first_line: true
 type_name:
   max_length: 50
 trailing_closure:
diff --git a/passAutoFillExtension/Controllers/CredentialProviderViewController.swift b/passAutoFillExtension/Controllers/CredentialProviderViewController.swift
index 8150bcd..3b9ec39 100644
--- a/passAutoFillExtension/Controllers/CredentialProviderViewController.swift
+++ b/passAutoFillExtension/Controllers/CredentialProviderViewController.swift
@@ -10,36 +10,44 @@ import AuthenticationServices
 import passKit
 
 class CredentialProviderViewController: ASCredentialProviderViewController {
-    var passcodelock: PasscodeExtensionDisplay {
+    private lazy var passcodelock: PasscodeExtensionDisplay = { [unowned self] in
         PasscodeExtensionDisplay(extensionContext: extensionContext)
-    }
+    }()
 
-    var embeddedNavigationController: UINavigationController {
-        children.first as! UINavigationController
-    }
+    private lazy var passwordsViewController: PasswordsViewController = {
+        (children.first as! UINavigationController).viewControllers.first as! PasswordsViewController
+    }()
 
-    var passwordsViewController: PasswordsViewController {
-        embeddedNavigationController.viewControllers.first as! PasswordsViewController
-    }
+    private lazy var credentialProvider: CredentialProvider = { [unowned self] in
+        CredentialProvider(viewController: self, extensionContext: extensionContext)
+    }()
 
-    lazy var credentialProvider = CredentialProvider(viewController: self, extensionContext: self.extensionContext)
+    private lazy var passwordsTableEntries = PasswordStore.shared.fetchPasswordEntityCoreData(withDir: false)
+        .map(PasswordTableEntry.init(_:))
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        passcodelock.presentPasscodeLockIfNeeded(self)
-
-        let passwordsTableEntries = PasswordStore.shared.fetchPasswordEntityCoreData(withDir: false).compactMap { PasswordTableEntry($0) }
-        let dataSource = PasswordsTableDataSource(entries: passwordsTableEntries)
-        passwordsViewController.dataSource = dataSource
+        passwordsViewController.dataSource = PasswordsTableDataSource(entries: passwordsTableEntries)
         passwordsViewController.selectionDelegate = self
-        passwordsViewController.navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .cancel, target: self, action: #selector(cancel))
+        passwordsViewController.navigationItem.leftBarButtonItem = UIBarButtonItem(
+            barButtonSystemItem: .cancel,
+            target: self,
+            action: #selector(cancel)
+        )
     }
 
     override func prepareCredentialList(for serviceIdentifiers: [ASCredentialServiceIdentifier]) {
-        credentialProvider.identifier = serviceIdentifiers.first
-        let url = serviceIdentifiers.first.flatMap { URL(string: $0.identifier) }
-        passwordsViewController.navigationItem.prompt = url?.host
-        passwordsViewController.showPasswordsWithSuggestion(matching: url?.host ?? "")
+        passcodelock.presentPasscodeLockIfNeeded(self) {
+            self.view.isHidden = true
+        } after: { [unowned self] in
+            self.view.isHidden = false
+            self.credentialProvider.identifier = serviceIdentifiers.first
+            let url = serviceIdentifiers.first
+                .map(\.identifier)
+                .flatMap(URL.init(string:))
+            self.passwordsViewController.navigationItem.prompt = url?.host
+            self.passwordsViewController.showPasswordsWithSuggestion(matching: url?.host ?? "")
+        }
     }
 
     override func provideCredentialWithoutUserInteraction(for credentialIdentity: ASPasswordCredentialIdentity) {
@@ -55,9 +63,11 @@ class CredentialProviderViewController: ASCredentialProviderViewController {
         guard let identifier = credentialIdentity.recordIdentifier else {
             return
         }
-        credentialProvider.identifier = credentialIdentity.serviceIdentifier
-        passwordsViewController.navigationItem.prompt = identifier
-        passwordsViewController.showPasswordsWithSuggestion(matching: identifier)
+        passcodelock.presentPasscodeLockIfNeeded(self, after: { [unowned self] in
+            self.credentialProvider.identifier = credentialIdentity.serviceIdentifier
+            self.passwordsViewController.navigationItem.prompt = identifier
+            self.passwordsViewController.showPasswordsWithSuggestion(matching: identifier)
+        })
     }
 
     @objc
@@ -68,8 +78,6 @@ class CredentialProviderViewController: ASCredentialProviderViewController {
 
 extension CredentialProviderViewController: PasswordSelectionDelegate {
     func selected(password: PasswordTableEntry) {
-        let passwordEntity = password.passwordEntity
-
-        credentialProvider.persistAndProvideCredentials(with: passwordEntity.getPath())
+        credentialProvider.persistAndProvideCredentials(with: password.passwordEntity.getPath())
     }
 }
diff --git a/passAutoFillExtension/Controllers/PasscodeExtensionDisplay.swift b/passAutoFillExtension/Controllers/PasscodeExtensionDisplay.swift
index 00c512c..72c0863 100644
--- a/passAutoFillExtension/Controllers/PasscodeExtensionDisplay.swift
+++ b/passAutoFillExtension/Controllers/PasscodeExtensionDisplay.swift
@@ -19,15 +19,12 @@ class PasscodeExtensionDisplay {
     }
 
     // present the passcode lock view if passcode is set and the view controller is not presented
-    func presentPasscodeLockIfNeeded(_ extensionVC: UIViewController) {
-        extensionVC.view.isHidden = true
-        guard PasscodeLock.shared.hasPasscode else {
-            extensionVC.view.isHidden = false
-            return
-        }
-        passcodeLockVC.modalPresentationStyle = .fullScreen
-        extensionVC.parent?.present(passcodeLockVC, animated: false) {
-            extensionVC.view.isHidden = false
+    func presentPasscodeLockIfNeeded(_ sender: UIViewController, before: (() -> Void)? = nil, after: (() -> Void)? = nil) {
+        if PasscodeLock.shared.hasPasscode {
+            before?()
+            passcodeLockVC.successCallback = after
+            passcodeLockVC.modalPresentationStyle = .fullScreen
+            sender.parent?.present(passcodeLockVC, animated: false)
         }
     }
 }
diff --git a/passExtension/Controllers/ExtensionViewController.swift b/passExtension/Controllers/ExtensionViewController.swift
index bb64a13..2a480b1 100644
--- a/passExtension/Controllers/ExtensionViewController.swift
+++ b/passExtension/Controllers/ExtensionViewController.swift
@@ -11,17 +11,20 @@ import MobileCoreServices
 import passKit
 
 class ExtensionViewController: UIViewController {
-    var passcodelock: PasscodeExtensionDisplay {
+    private lazy var passcodelock: PasscodeExtensionDisplay = { [unowned self] in
         PasscodeExtensionDisplay(extensionContext: extensionContext!)
-    }
+    }()
 
-    var embeddedNavigationController: UINavigationController {
-        children.first as! UINavigationController
-    }
+    private lazy var passwordsViewController: PasswordsViewController = {
+        (children.first as! UINavigationController).viewControllers.first as! PasswordsViewController
+    }()
 
-    var passwordsViewController: PasswordsViewController {
-        embeddedNavigationController.viewControllers.first as! PasswordsViewController
-    }
+    private lazy var credentialProvider: CredentialProvider = { [unowned self] in
+        CredentialProvider(viewController: self, extensionContext: extensionContext!)
+    }()
+
+    private lazy var passwordsTableEntries = PasswordStore.shared.fetchPasswordEntityCoreData(withDir: false)
+        .map(PasswordTableEntry.init(_:))
 
     enum Action {
         case findLogin, fillBrowser, unknown
@@ -29,17 +32,16 @@ class ExtensionViewController: UIViewController {
 
     private var action = Action.unknown
 
-    lazy var credentialProvider = CredentialProvider(viewController: self, extensionContext: self.extensionContext!)
-
     override func viewDidLoad() {
         super.viewDidLoad()
-        passcodelock.presentPasscodeLockIfNeeded(self)
-
-        let passwordsTableEntries = PasswordStore.shared.fetchPasswordEntityCoreData(withDir: false).compactMap { PasswordTableEntry($0) }
-        let dataSource = PasswordsTableDataSource(entries: passwordsTableEntries)
-        passwordsViewController.dataSource = dataSource
+        view.isHidden = true
+        passwordsViewController.dataSource = PasswordsTableDataSource(entries: passwordsTableEntries)
         passwordsViewController.selectionDelegate = self
-        passwordsViewController.navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .cancel, target: self, action: #selector(cancel))
+        passwordsViewController.navigationItem.leftBarButtonItem = UIBarButtonItem(
+            barButtonSystemItem: .cancel,
+            target: self,
+            action: #selector(cancel)
+        )
     }
 
     override func viewWillAppear(_ animated: Bool) {
@@ -47,12 +49,19 @@ class ExtensionViewController: UIViewController {
         prepareCredentialList()
     }
 
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        passcodelock.presentPasscodeLockIfNeeded(self, after: { [unowned self] in
+            self.view.isHidden = false
+        })
+    }
+
     @objc
     private func cancel(_: AnyObject?) {
         extensionContext?.completeRequest(returningItems: nil)
     }
 
-    func prepareCredentialList() {
+    private func prepareCredentialList() {
         guard let attachments = extensionContext?.attachments else {
             return
         }