diff --git a/ElementX/Sources/Screens/AppLock/AppLockScreen/AppLockScreenModels.swift b/ElementX/Sources/Screens/AppLock/AppLockScreen/AppLockScreenModels.swift
index 317460147d..63e34ab901 100644
--- a/ElementX/Sources/Screens/AppLock/AppLockScreen/AppLockScreenModels.swift
+++ b/ElementX/Sources/Screens/AppLock/AppLockScreen/AppLockScreenModels.swift
@@ -38,7 +38,7 @@ struct AppLockScreenViewState: BindableState {
         if !isSubtitleWarning {
             return L10n.screenAppLockSubtitle
         } else {
-            return L10n.screenAppLockSubtitleWrongPin(3 - numberOfPINAttempts)
+            return L10n.screenAppLockSubtitleWrongPin(maximumAttempts - numberOfPINAttempts)
         }
     }
 }
diff --git a/ElementX/Sources/Screens/AppLock/AppLockScreen/AppLockScreenViewModel.swift b/ElementX/Sources/Screens/AppLock/AppLockScreen/AppLockScreenViewModel.swift
index 18b66acacb..001c7e1a76 100644
--- a/ElementX/Sources/Screens/AppLock/AppLockScreen/AppLockScreenViewModel.swift
+++ b/ElementX/Sources/Screens/AppLock/AppLockScreen/AppLockScreenViewModel.swift
@@ -48,13 +48,13 @@ class AppLockScreenViewModel: AppLockScreenViewModelType, AppLockScreenViewModel
         case .clearPINCode:
             state.bindings.pinCode = ""
         case .forgotPIN:
-            forgotPIN()
+            handleForgotPIN()
         }
     }
     
     // MARK: - Private
     
-    private func forgotPIN() {
+    private func handleForgotPIN() {
         state.bindings.alertInfo = .init(id: .confirmResetPIN,
                                          title: L10n.screenAppLockSignoutAlertTitle,
                                          message: L10n.screenAppLockSignoutAlertMessage,