diff --git a/res/layout/account_setup_exchange.xml b/res/layout/account_setup_exchange.xml
index 0c33b6ad6..a95ecc610 100644
--- a/res/layout/account_setup_exchange.xml
+++ b/res/layout/account_setup_exchange.xml
@@ -20,32 +20,11 @@
     android:layout_height="match_parent"
     android:fillViewport="true">
 
-    <LinearLayout
+    <fragment
+        android:id="@+id/setup_fragment"
+        class="com.android.email.activity.setup.AccountSetupExchangeFragment"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical" >
-
-        <fragment
-            android:id="@+id/setup_fragment"
-            class="com.android.email.activity.setup.AccountSetupExchangeFragment"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-        />
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="54dip"
-            android:background="@android:drawable/bottom_bar">
-            <Button
-                android:id="@+id/next"
-                android:text="@string/next_action"
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:minWidth="@dimen/button_minWidth"
-                android:drawableRight="@drawable/button_indicator_next"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true" />
-        </RelativeLayout>
-    </LinearLayout>
+        android:layout_weight="1"
+    />
 </ScrollView>
diff --git a/src/com/android/email/activity/setup/AccountSetupNames.java b/src/com/android/email/activity/setup/AccountSetupNames.java
index 67693c5fc..346347f7f 100644
--- a/src/com/android/email/activity/setup/AccountSetupNames.java
+++ b/src/com/android/email/activity/setup/AccountSetupNames.java
@@ -152,7 +152,7 @@ public class AccountSetupNames extends AccountSetupActivity {
      * TODO: Validator should also trim the name string before checking it.
      */
     private void validateFields() {
-        boolean newEnabled = !mEasAccount || Utility.isTextViewNotEmpty(mName);
+        boolean newEnabled = mEasAccount || Utility.isTextViewNotEmpty(mName);
         if (newEnabled != mNextButtonEnabled) {
             mNextButtonEnabled = newEnabled;
             invalidateOptionsMenu();