diff --git a/Classes/BITHockeyHelper.m b/Classes/BITHockeyHelper.m
index d7776170cf..60511d6fdb 100644
--- a/Classes/BITHockeyHelper.m
+++ b/Classes/BITHockeyHelper.m
@@ -209,7 +209,7 @@ NSString *bit_appAnonID(void) {
                               andPassword:appAnonID
                            forServiceName:bit_keychainHockeySDKServiceName()
                            updateExisting:YES
-                            accessibility:kSecAttrAccessibleWhenUnlockedThisDeviceOnly
+                            accessibility:kSecAttrAccessibleAlwaysThisDeviceOnly
                                     error:&error];
         });
       }
diff --git a/Classes/BITHockeyManager.m b/Classes/BITHockeyManager.m
index 490f04412d..8af4189753 100644
--- a/Classes/BITHockeyManager.m
+++ b/Classes/BITHockeyManager.m
@@ -391,7 +391,7 @@ bitstadium_info_t bitstadium_library_info __attribute__((section("__TEXT,__bit_h
                                   andPassword:value
                                forServiceName:bit_keychainHockeySDKServiceName()
                                updateExisting:YES
-                                accessibility:kSecAttrAccessibleWhenUnlockedThisDeviceOnly
+                                accessibility:kSecAttrAccessibleAlwaysThisDeviceOnly
                                         error:&error];
   } else {
     updateType = @"delete";
diff --git a/Classes/BITKeychainUtils.m b/Classes/BITKeychainUtils.m
index 24e52373ab..b3cbea2824 100644
--- a/Classes/BITKeychainUtils.m
+++ b/Classes/BITKeychainUtils.m
@@ -123,7 +123,7 @@ static NSString *BITKeychainUtilsErrorDomain = @"BITKeychainUtilsErrorDomain";
 }
 
 + (BOOL) storeUsername: (NSString *) username andPassword: (NSString *) password forServiceName: (NSString *) serviceName updateExisting: (BOOL) updateExisting error: (NSError **) error {
-  return [self storeUsername:username andPassword:password forServiceName:serviceName updateExisting:updateExisting accessibility:kSecAttrAccessibleWhenUnlocked error:error];
+  return [self storeUsername:username andPassword:password forServiceName:serviceName updateExisting:updateExisting accessibility:kSecAttrAccessibleAlways error:error];
 }
 
 + (BOOL) storeUsername: (NSString *) username andPassword: (NSString *) password forServiceName: (NSString *) serviceName updateExisting: (BOOL) updateExisting accessibility:(CFTypeRef) accessibility error: (NSError **) error
diff --git a/Support/HockeySDKTests/BITKeychainUtilsTests.m b/Support/HockeySDKTests/BITKeychainUtilsTests.m
index dc6ba513c9..1bd87ff9e7 100644
--- a/Support/HockeySDKTests/BITKeychainUtilsTests.m
+++ b/Support/HockeySDKTests/BITKeychainUtilsTests.m
@@ -60,7 +60,7 @@
                                        andPassword:@"PanThisDeviceOnly"
                                     forServiceName:@"Test"
                                     updateExisting:YES
-                                     accessibility:kSecAttrAccessibleWhenUnlockedThisDeviceOnly
+                                     accessibility:kSecAttrAccessibleAlwaysThisDeviceOnly
                                              error:nil];
   assertThatBool(success, equalToBool(YES));
   NSString *pass = [BITKeychainUtils getPasswordForUsername:@"Peter"