diff --git a/res/xml/user_settings.xml b/res/xml/user_settings.xml
index 5944b3eb051..8d20f31d90a 100644
--- a/res/xml/user_settings.xml
+++ b/res/xml/user_settings.xml
@@ -35,9 +35,9 @@
                 android:key="add_users_when_locked"
                 android:title="@string/user_add_on_lockscreen_menu"
                 android:summary="@string/user_add_on_lockscreen_menu_summary" />
-        <Preference
-            android:key="emergency_info"
-            android:title="@string/emergency_info_title"
-            android:summary="@string/emergency_info_subtitle"/>
     </PreferenceCategory>
+    <Preference
+        android:key="emergency_info"
+        android:title="@string/emergency_info_title"
+        android:summary="@string/emergency_info_subtitle"/>
 </PreferenceScreen>
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 6a50a6d092d..8ff26f78b65 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -104,7 +104,6 @@ public class UserSettings extends SettingsPreferenceFragment
     private static final String KEY_USER_ME = "user_me";
     private static final String KEY_ADD_USER = "user_add";
     private static final String KEY_EMERGENCY_INFO = "emergency_info";
-    private static final String KEY_LOCK_SCREEN_SETTINGS = "lock_screen_settings";
 
     private static final String ACTION_EDIT_EMERGENCY_INFO = "android.settings.EDIT_EMERGENGY_INFO";
 
@@ -237,14 +236,6 @@ public class UserSettings extends SettingsPreferenceFragment
         mLockScreenSettings = (PreferenceGroup) findPreference("lock_screen_settings");
         mAddUserWhenLocked = (RestrictedSwitchPreference) findPreference("add_users_when_locked");
         mEmergencyInfoPreference = findPreference(KEY_EMERGENCY_INFO);
-        if(emergencyInfoActivityPresent()) {
-            mEmergencyInfoPreference.setOnPreferenceClickListener(this);
-        } else {
-            // Remove this view if the emergency info package is not found.
-            PreferenceCategory lockScreenSettingsCategory =
-                    (PreferenceCategory) findPreference(KEY_LOCK_SCREEN_SETTINGS);
-            lockScreenSettingsCategory.removePreference(mEmergencyInfoPreference);
-        }
         loadProfile();
         setHasOptionsMenu(true);
         IntentFilter filter = new IntentFilter(Intent.ACTION_USER_REMOVED);
@@ -843,6 +834,12 @@ public class UserSettings extends SettingsPreferenceFragment
             mAddUserWhenLocked.setDisabledByAdmin(
                     mUserCaps.mDisallowAddUser ? mUserCaps.mEnforcedAdmin : null);
         }
+
+        if (emergencyInfoActivityPresent()) {
+            mEmergencyInfoPreference.setOnPreferenceClickListener(this);
+            mEmergencyInfoPreference.setOrder(Preference.DEFAULT_ORDER);
+            preferenceScreen.addPreference(mEmergencyInfoPreference);
+        }
     }
 
     private int getMaxRealUsers() {