diff --git a/res/layout-sw600dp/account_setup_basics_common.xml b/res/layout-sw600dp/account_setup_basics_common.xml
index 616309592..376a55783 100644
--- a/res/layout-sw600dp/account_setup_basics_common.xml
+++ b/res/layout-sw600dp/account_setup_basics_common.xml
@@ -35,12 +35,11 @@
     <TableLayout
         android:id="@+id/email_password_table"
         android:layout_below="@+id/instructions"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="16dip"
-        android:stretchColumns="1" >
-        <TableRow
-            android:paddingTop="16dip" >
+        android:layout_marginTop="16dip">
+
+        <TableRow android:paddingTop="16dip" >
             <TextView
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
@@ -49,14 +48,12 @@
                 android:textAppearance="@style/accountSetupLabelText" />
             <EditText
                 android:id="@+id/account_email"
-                android:layout_marginRight="96dip"
-                android:layout_width="wrap_content"
+                android:layout_width="@dimen/setup_credentials_input_width"
                 android:layout_height="wrap_content"
                 android:inputType="textEmailAddress"
                 android:imeOptions="actionNext" />
         </TableRow>
-        <TableRow
-            android:paddingTop="16dip" >
+        <TableRow android:paddingTop="16dip" >
             <TextView
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
@@ -65,9 +62,8 @@
                 android:textAppearance="@style/accountSetupLabelText" />
             <EditText
                 android:id="@+id/account_password"
-                android:layout_marginRight="96dip"
                 android:layout_height="wrap_content"
-                android:layout_width="match_parent"
+                android:layout_width="@dimen/setup_credentials_input_width"
                 android:inputType="textPassword"
                 android:imeOptions="actionDone"
                 android:nextFocusDown="@+id/next" />
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index cb8f18c62..bb6eac73a 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -67,4 +67,7 @@
 
     <dimen name="account_spinner_dropdown_account_name_max_width">352dip</dimen>
 
+    <!-- Username/password entry -->
+    <dimen name="setup_credentials_input_width">340dip</dimen>
+
 </resources>