diff --git a/app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java b/app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java
index b058c99c91..ad75d60330 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java
@@ -84,6 +84,7 @@ public class PassphrasePromptActivity extends BaseActionBarActivity {
       }
       @Override
       public void onServiceDisconnected(ComponentName name) {
+        keyCachingService.setMasterSecret(new Object());
         keyCachingService = null;
       }
     }, Context.BIND_AUTO_CREATE);
@@ -133,7 +134,9 @@ public class PassphrasePromptActivity extends BaseActionBarActivity {
   private void handleAuthenticated() {
     authenticated = true;
     //TODO Replace with a proper call.
-    keyCachingService.setMasterSecret(new Object());
+    if (keyCachingService != null) {
+      keyCachingService.setMasterSecret(new Object());
+    }
 
     // Finish and proceed with the next intent.
     Intent nextIntent = getIntent().getParcelableExtra("next_intent");
@@ -188,6 +191,8 @@ public class PassphrasePromptActivity extends BaseActionBarActivity {
 
     if (!keyguardManager.isKeyguardSecure()) {
       Log.w(TAG ,"Keyguard not secure...");
+      TextSecurePreferences.setScreenLockEnabled(getApplicationContext(), false);
+      TextSecurePreferences.setScreenLockTimeout(getApplicationContext(), 0);
       handleAuthenticated();
       return;
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java
index db9484f9b0..e516916de4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java
@@ -102,7 +102,8 @@ public class AppProtectionPreferenceFragment extends CorrectedPreferenceFragment
         if (duration == 0) {
           TextSecurePreferences.setScreenLockTimeout(getContext(), 0);
         } else {
-          long timeoutSeconds = Math.max(TimeUnit.MILLISECONDS.toSeconds(duration), 60);
+          long timeoutSeconds = TimeUnit.MILLISECONDS.toSeconds(duration);
+//          long timeoutSeconds = Math.max(TimeUnit.MILLISECONDS.toSeconds(duration), 60);
           TextSecurePreferences.setScreenLockTimeout(getContext(), timeoutSeconds);
         }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java b/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java
index e1c2350ef1..e204c3f503 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java
@@ -119,7 +119,6 @@ public class KeyCachingService extends Service {
       KeyCachingService.masterSecret = masterSecret;
 
       foregroundService();
-      startTimeoutIfAppropriate(this);
       
       new AsyncTask<Void, Void, Void>() {
         @Override
@@ -210,7 +209,7 @@ public class KeyCachingService extends Service {
     boolean passLockActive   = timeoutEnabled && !TextSecurePreferences.isPasswordDisabled(context);
 
     long    screenTimeout    = TextSecurePreferences.getScreenLockTimeout(context);
-    boolean screenLockActive = screenTimeout >= 60 && TextSecurePreferences.isScreenLockEnabled(context);
+    boolean screenLockActive = screenTimeout >= 0 && TextSecurePreferences.isScreenLockEnabled(context);
 
     if (!appVisible && secretSet && (passLockActive || screenLockActive)) {
       long passphraseTimeoutMinutes = TextSecurePreferences.getPassphraseTimeoutInterval(context);