diff --git a/app/src/main/java/com/keylesspalace/tusky/LoginActivity.java b/app/src/main/java/com/keylesspalace/tusky/LoginActivity.java
index 88a453c3..67cf7e56 100644
--- a/app/src/main/java/com/keylesspalace/tusky/LoginActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/LoginActivity.java
@@ -56,7 +56,6 @@ public class LoginActivity extends AppCompatActivity {
     @BindView(R.id.button_login) Button button;
     @BindView(R.id.no_account) TextView noAccount;
 
-    @Override
     protected void createMastodonAPI() {
         // Don't do this in this activity, since we don't know a domain yet
     }
diff --git a/app/src/main/res/layout/activity_account.xml b/app/src/main/res/layout/activity_account.xml
index d238fa4d..c8993720 100644
--- a/app/src/main/res/layout/activity_account.xml
+++ b/app/src/main/res/layout/activity_account.xml
@@ -36,17 +36,17 @@
                     android:scaleType="centerCrop"
                     app:layout_collapseMode="pin"
                     android:fitsSystemWindows="true"
-                    android:adjustViewBounds="true" />
+                    android:layout_alignTop="@+id/account_header_info"
+                    android:layout_alignBottom="@id/account_header_info" />
 
                 <LinearLayout
                     android:orientation="vertical"
+                    android:id="@+id/account_header_info"
                     android:paddingTop="?attr/actionBarSize"
                     android:background="@drawable/account_header_gradient"
                     android:layout_width="match_parent"
                     app:layout_collapseMode="parallax"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentTop="true"
-                    android:layout_alignParentBottom="true">
+                    android:layout_height="wrap_content">
 
                     <RelativeLayout
                         android:layout_width="match_parent"