diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml
index d4d68e2b3..0647aa8b9 100644
--- a/.github/workflows/alpha.yml
+++ b/.github/workflows/alpha.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Save artifact
         uses: actions/upload-artifact@master
         with:
-          name: PTelegramAlpha-1585.apk
+          name: PTelegramAlpha-1586.apk
           path: TMessagesProj/build/outputs/apk/afat/alpha/app.apk
       - name: Create cleanup request
         run: touch delete_request
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/fakepasscode/FakePasscode.java b/TMessagesProj/src/main/java/org/telegram/messenger/fakepasscode/FakePasscode.java
index b1ec9ffbd..21b31a0e9 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/fakepasscode/FakePasscode.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/fakepasscode/FakePasscode.java
@@ -349,8 +349,15 @@ public class FakePasscode {
 
     private void checkPasswordlessMode() {
         passwordDisabled = passwordlessMode;
-        MediaDataController.getInstance(UserConfig.selectedAccount).buildShortcuts();
-        NotificationCenter.getGlobalInstance().postNotificationName(NotificationCenter.didSetPasscode);
+        if (passwordDisabled) {
+            SharedConfig.setAppLocked(false);
+            SharedConfig.isWaitingForPasscodeEnter = false;
+            SharedConfig.saveConfig();
+            MediaDataController.getInstance(UserConfig.selectedAccount).buildShortcuts();
+            AndroidUtilities.runOnUIThread(() -> {
+                NotificationCenter.getGlobalInstance().postNotificationName(NotificationCenter.didSetPasscode);
+            });
+        }
     }
 
     public boolean passcodeEnabled() {
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/fakepasscode/FakePasscodeUtils.java b/TMessagesProj/src/main/java/org/telegram/messenger/fakepasscode/FakePasscodeUtils.java
index 47b99c086..736fe6af9 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/fakepasscode/FakePasscodeUtils.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/fakepasscode/FakePasscodeUtils.java
@@ -397,13 +397,17 @@ public class FakePasscodeUtils {
     }
 
     public static synchronized void tryActivateByTimer() {
+        tryActivateByTimer(false);
+    }
+
+    public static synchronized void tryActivateByTimer(boolean force) {
         try {
-            if (SharedConfig.lastPauseFakePasscodeTime == 0 || SharedConfig.autoLockIn == 1 && !SharedConfig.isAppLocked()) {
+            if (SharedConfig.lastPauseFakePasscodeTime == 0) {
                 return;
             }
             long uptime = SystemClock.elapsedRealtime() / 1000;
-            long duration = uptime - SharedConfig.lastPauseFakePasscodeTime;
-            if (SharedConfig.isAppLocked() && LaunchActivity.isResumed && duration < 30) {
+            long duration = Math.max(uptime - SharedConfig.lastPauseFakePasscodeTime, force ? 1 : 0);
+            if (!force && SharedConfig.isAppLocked() && LaunchActivity.isResumed && duration < 30) {
                 return; // Don't activate if PasscodeView is shown
             }
             List<FakePasscode> sortedPasscodes = SharedConfig.fakePasscodes.stream()
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/partisan/PartisanVersion.java b/TMessagesProj/src/main/java/org/telegram/messenger/partisan/PartisanVersion.java
index 3a9f3a608..cc9c18d04 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/partisan/PartisanVersion.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/partisan/PartisanVersion.java
@@ -2,5 +2,5 @@ package org.telegram.messenger.partisan;
 
 public class PartisanVersion {
     public static final String PARTISAN_VERSION_STRING = "4.1.3";
-    public static int PARTISAN_BUILD_VERSION = 1585;
+    public static int PARTISAN_BUILD_VERSION = 1586;
 }
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/PasscodeView.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/PasscodeView.java
index a9453f976..4aee61592 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Components/PasscodeView.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/PasscodeView.java
@@ -99,7 +99,7 @@ public class PasscodeView extends FrameLayout implements NotificationCenter.Noti
             }
         } else if (id == NotificationCenter.fakePasscodeActivated) {
             if (FakePasscodeUtils.isFakePasscodeActivated() && !FakePasscodeUtils.getActivatedFakePasscode().passcodeEnabled()) {
-                appUnlocked();
+                forceDismiss();
             }
         }
     }
@@ -1065,6 +1065,15 @@ public class PasscodeView extends FrameLayout implements NotificationCenter.Noti
         va.start();
     }
 
+    private void forceDismiss() {
+        if (delegate != null) {
+            delegate.didAcceptedPassword(this);
+        }
+        setVisibility(View.GONE);
+        onHidden();
+        setAlpha(0f);
+    }
+
     private float shownT;
     protected void onAnimationUpdate(float open) {
 
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
index 1d5ec9083..79009c935 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
@@ -6696,6 +6696,7 @@ public class LaunchActivity extends BasePermissionsActivity implements INavigati
             onResumeStaticCallback = null;
         }
         if (!SharedConfig.isAppLocked()) {
+            FakePasscodeUtils.tryActivateByTimer(true);
             SharedConfig.lastPauseFakePasscodeTime = 0;
         }
         if (Theme.selectedAutoNightType == Theme.AUTO_NIGHT_TYPE_SYSTEM) {
@@ -6725,7 +6726,7 @@ public class LaunchActivity extends BasePermissionsActivity implements INavigati
                     layersActionBarLayout.onResume();
                 }
             }
-        } else {
+        } else if (SharedConfig.isAppLocked()) { // ignore if app locked
             actionBarLayout.dismissDialogs();
             if (AndroidUtilities.isTablet()) {
                 if (rightActionBarLayout != null) {