2 files changed, 25 insertions, 25 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 1a4b0d4..5f38cdcf 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -9274,13 +9274,13 @@ Keep your key file in a safe place. You will need it to create new versions of y
         Join other network...
       </message>
       <message name="IDS_OPTIONS_ACCOUNTS_ALLOW_BWSI_DESCRIPTION" desc="In the Accounts settings tab, the text on the checkbox to allow browse without signing in.">
-        Allow browse without signing in.
+        Enable guest browsing
       </message>
       <message name="IDS_OPTIONS_ACCOUNTS_ALLOW_GUEST_DESCRIPTION" desc="In the Accounts settings tab, the text on the checkbox to allow guest to sign in.">
-        Allow anyone to sign in.
+        Restrict sign-in to the following users:
       </message>
       <message name="IDS_OPTIONS_ACCOUNTS_SHOW_USER_NAMES_ON_SINGIN_DESCRIPTION" desc="In the Accounts settings tab, the text on the checkbox to show user names and pictures on signin screen.">
-        Show usernames and pictures on sign-in page.
+        Show usernames and photos on the sign-in screen
       </message>
       <message name="IDS_OPTIONS_ACCOUNTS_USERNAME_EDIT_HINT" desc="In the Accounts settings tab, the instruction text on an empty username edit.">
         Enter names or addresses.
diff --git a/chrome/browser/resources/options/chromeos_accounts_options.html b/chrome/browser/resources/options/chromeos_accounts_options.html
index 6c609f7..8519757 100644
--- a/chrome/browser/resources/options/chromeos_accounts_options.html
+++ b/chrome/browser/resources/options/chromeos_accounts_options.html
@@ -3,21 +3,6 @@
   <section>
     <div class="option">
       <table class="option-control-table">
-      <tr><td>
-        <table class="user-list-table">
-          <tr><td>
-            <list id="userList"></list>
-          </td></tr>
-          <tr><td class="user-name-edit-row">
-            <label><span i18n-content="add_users"></span><br>
-            <input id="userNameEdit" type="text"
-                i18n-values="placeholder:username_edit_hint">
-            </span>
-            </label>
-          </td></tr>
-        </table>
-      </td></tr>
-      <tr><td>&nbsp;</td></tr>
       <tr>
         <td class="option-name">
           <label class="checkbox">
@@ -30,22 +15,37 @@
       <tr>
         <td class="option-name">
           <label class="checkbox">
-            <input id="allowGuestCheck" pref="cros.accounts.allowGuest"
-                 type="checkbox">
-            <span i18n-content="allow_guest"></span>
+            <input id="showUserNamesCheck"
+                pref="cros.accounts.showUserNamesOnSignIn" type="checkbox">
+            <span i18n-content="show_user_on_signin"></span>
           </label>
         </td>
       </tr>
       <tr>
         <td class="option-name">
           <label class="checkbox">
-            <input id="showUserNamesCheck"
-                pref="cros.accounts.showUserNamesOnSignIn" type="checkbox">
-            <span i18n-content="show_user_on_signin"></span>
+            <input id="allowGuestCheck" pref="cros.accounts.allowGuest"
+                 type="checkbox">
+            <span i18n-content="allow_guest"></span>
           </label>
         </td>
       </tr>
-      </table>
+      <tr><td>&nbsp;</td></tr>
+      <tr><td>
+        <table class="user-list-table">
+          <tr><td>
+            <list id="userList"></list>
+          </td></tr>
+          <tr><td class="user-name-edit-row">
+            <label><span i18n-content="add_users"></span><br>
+            <input id="userNameEdit" type="text"
+                i18n-values="placeholder:username_edit_hint">
+            </span>
+            </label>
+          </td></tr>
+        </table>
+      </td></tr>
+     </table>
     </div>
   </section>
 </div>