diff --git a/src/com/android/browser/AutoFillSettingsFragment.java b/src/com/android/browser/AutoFillSettingsFragment.java
index 608c3de..7728149 100644
--- a/src/com/android/browser/AutoFillSettingsFragment.java
+++ b/src/com/android/browser/AutoFillSettingsFragment.java
@@ -43,6 +43,11 @@
     private EditText mCountryEdit;
     private EditText mPhoneEdit;
 
+    // For now we support just one profile so it's safe to hardcode the
+    // id to 1 here. In the future this unique identifier will be set
+    // dynamically.
+    private int mUniqueId = 1;
+
     public AutoFillSettingsFragment() {
 
     }
@@ -75,6 +80,7 @@
             public void onClick(View button) {
                 BrowserSettings.getInstance().setAutoFillProfile(getActivity(),
                         new AutoFillProfile(
+                                mUniqueId,
                                 mFullNameEdit.getText().toString(),
                                 mEmailEdit.getText().toString(),
                                 mCompanyEdit.getText().toString(),
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index 96b6fd2..3b8aaa4 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -133,9 +133,11 @@
 
 
     private AutoFillProfile mAutoFillProfile;
-    // TODO: For now we only support one autofill profile. Add support for
-    // multiple profiles later.
-    private int mActiveAutoFillProfileId = 1;
+    // Default to zero. In the case no profile is set up, the initial
+    // value will come from the AutoFillSettingsFragment when the user
+    // creates a profile. Otherwise, we'll read the ID of the last used
+    // profile from the prefs db.
+    private int autoFillActiveProfileId;
 
     // Preference keys that are used outside this class
     public final static String PREF_CLEAR_CACHE = "privacy_clear_cache";
@@ -159,6 +161,7 @@
             "privacy_clear_geolocation_access";
     public final static String PREF_AUTOFILL_ENABLED = "autofill_enabled";
     public final static String PREF_AUTOFILL_PROFILE = "autofill_profile";
+    public final static String PREF_AUTOFILL_ACTIVE_PROFILE_ID = "autofill_active_profile_id";
 
     private static final String DESKTOP_USERAGENT = "Mozilla/5.0 (Macintosh; " +
             "U; Intel Mac OS X 10_6_3; en-us) AppleWebKit/533.16 (KHTML, " +
@@ -313,11 +316,15 @@
             pageCacheCapacity = 1;
         }
 
+        // Read the last active AutoFill profile id.
+        autoFillActiveProfileId = p.getInt(
+                PREF_AUTOFILL_ACTIVE_PROFILE_ID, autoFillActiveProfileId);
+
         // Load the autofill profile data from the database. We use a database separate
         // to the browser preference DB to make it easier to support multiple profiles
         // and switching between them.
         AutoFillProfileDatabase autoFillDb = AutoFillProfileDatabase.getInstance(ctx);
-        Cursor c = autoFillDb.getProfile(mActiveAutoFillProfileId);
+        Cursor c = autoFillDb.getProfile(autoFillActiveProfileId);
 
         if (c.getCount() > 0) {
             c.moveToFirst();
@@ -342,9 +349,9 @@
                     AutoFillProfileDatabase.Profiles.COUNTRY));
             String phone = c.getString(c.getColumnIndex(
                     AutoFillProfileDatabase.Profiles.PHONE_NUMBER));
-            mAutoFillProfile = new AutoFillProfile(fullName, email, company,
-                    addressLine1, addressLine2, city, state, zip, country,
-                    phone);
+            mAutoFillProfile = new AutoFillProfile(autoFillActiveProfileId,
+                    fullName, email, company, addressLine1, addressLine2, city,
+                    state, zip, country, phone);
         }
         c.close();
         autoFillDb.close();
@@ -528,6 +535,7 @@
 
     public void setAutoFillProfile(Context ctx, AutoFillProfile profile) {
         mAutoFillProfile = profile;
+        setActiveAutoFillProfileId(ctx, profile.getUniqueId());
         // Update the AutoFill DB
         new SaveProfileToDbTask(ctx).execute(mAutoFillProfile);
 
@@ -537,6 +545,14 @@
         return mAutoFillProfile;
     }
 
+    private void setActiveAutoFillProfileId(Context context, int activeProfileId) {
+        autoFillActiveProfileId = activeProfileId;
+        Editor ed = PreferenceManager.
+            getDefaultSharedPreferences(context).edit();
+        ed.putInt(PREF_AUTOFILL_ACTIVE_PROFILE_ID, activeProfileId);
+        ed.apply();
+    }
+
     /**
      * Add a WebSettings object to the list of observers that will be updated
      * when update() is called.
@@ -689,6 +705,8 @@
         rememberPasswords = true;
         saveFormData = true;
         autoFillEnabled = false;
+        // TODO: Should remove the autofill profile fully and
+        // set the active profile id to 0.
         openInBackground = false;
         autoFitPage = true;
         landscapeOnly = false;
@@ -713,7 +731,8 @@
 
         protected Void doInBackground(AutoFillProfile... values) {
             mAutoFillProfileDb = AutoFillProfileDatabase.getInstance(mContext);
-            mAutoFillProfileDb.addOrUpdateProfile(mActiveAutoFillProfileId, values[0]);
+            assert autoFillActiveProfileId > 0;
+            mAutoFillProfileDb.addOrUpdateProfile(autoFillActiveProfileId, values[0]);
             return null;
         }