diff --git a/res/layout/account_credentials_fragment.xml b/res/layout/account_credentials_fragment.xml
index eff24a9cc..babf73964 100644
--- a/res/layout/account_credentials_fragment.xml
+++ b/res/layout/account_credentials_fragment.xml
@@ -13,23 +13,20 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
-<LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        style="@style/account_setup_fragment_container"
-        android:layout_width="match_parent"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_height="match_parent"
-        android:orientation="vertical" >
-
-    <include
-            layout="@layout/account_setup_credentials_fragment"
+        android:layout_width="match_parent" >
+    <LinearLayout
+            style="@style/account_setup_fragment_container"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            android:orientation="vertical" >
+
+        <include
+                layout="@layout/account_setup_credentials_fragment"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
 
-    <FrameLayout android:id="@+id/button_container"
-                 android:layout_width="match_parent"
-                 android:layout_height="wrap_content">
         <include layout="@layout/account_settings_buttons" />
-    </FrameLayout>
-
-</LinearLayout>
+    </LinearLayout>
+</ScrollView>