diff --git a/MasterPassword/iOS/MPAppDelegate.m b/MasterPassword/iOS/MPAppDelegate.m
index c50b212b..0dccc856 100644
--- a/MasterPassword/iOS/MPAppDelegate.m
+++ b/MasterPassword/iOS/MPAppDelegate.m
@@ -54,7 +54,7 @@
     [[[NSBundle mainBundle] mutableInfoDictionary] setObject:@"Master Password" forKey:@"CFBundleDisplayName"];
     [[[NSBundle mainBundle] mutableLocalizedInfoDictionary] setObject:@"Master Password" forKey:@"CFBundleDisplayName"];
 
-#ifdef ADHOC
+#ifdef TESTFLIGHT_SDK_VERSION
     @try {
         NSString *testFlightToken = [self testFlightToken];
         if ([testFlightToken length]) {
diff --git a/MasterPassword/iOS/MPUnlockViewController.m b/MasterPassword/iOS/MPUnlockViewController.m
index 70aea4aa..082fd361 100644
--- a/MasterPassword/iOS/MPUnlockViewController.m
+++ b/MasterPassword/iOS/MPUnlockViewController.m
@@ -426,7 +426,7 @@
         // User was just selected.
         self.passwordView.alpha        = 1;
         self.avatarsView.center        = CGPointMake(160, 180);
-        self.avatarsView.scrollEnabled = NO;
+        //self.avatarsView.scrollEnabled = NO;
         self.nameLabel.center          = CGPointMake(160, 94);
         self.nameLabel.backgroundColor = [UIColor blackColor];
         self.oldNameLabel.center       = self.nameLabel.center;
@@ -437,7 +437,7 @@
             self.passwordField.text        = nil;
             self.passwordView.alpha        = 0;
             self.avatarsView.center        = CGPointMake(160, 310);
-            self.avatarsView.scrollEnabled = YES;
+            //self.avatarsView.scrollEnabled = YES;
             self.nameLabel.center          = CGPointMake(160, 296);
             self.nameLabel.backgroundColor = [UIColor clearColor];
             self.oldNameLabel.center       = self.nameLabel.center;