diff --git a/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java b/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java
index f5455e3..874f221 100644
--- a/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java
+++ b/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java
@@ -18,6 +18,7 @@
 
 import android.app.Activity;
 import android.content.Intent;
+import android.os.Build;
 import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
@@ -71,11 +72,7 @@
     @Override
     public boolean onOptionsItemSelected(final MenuItem item) {
         final Activity activity = getActivity();
-        final int setupStatus = Secure.getInt(
-                activity.getContentResolver(),
-                "user_setup_complete",
-                0 /* default */);
-        if (setupStatus == 0) {
+        if (!isUserSetupComplete(activity)) {
             // If setup is not complete, it's not safe to launch Help or other activities
             // because they might go to the Play Store.  See b/19866981.
             return true;
@@ -94,4 +91,11 @@
         }
         return super.onOptionsItemSelected(item);
     }
+
+    private static boolean isUserSetupComplete(final Activity activity) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+            return true;
+        }
+        return Secure.getInt(activity.getContentResolver(), "user_setup_complete", 0) != 0;
+    }
 }
