diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/CustomEmojiPopupKeyboard.java b/mastodon/src/main/java/org/joinmastodon/android/ui/CustomEmojiPopupKeyboard.java
index 923a09a27..25b611149 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/CustomEmojiPopupKeyboard.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/CustomEmojiPopupKeyboard.java
@@ -72,7 +72,7 @@ public class CustomEmojiPopupKeyboard extends PopupKeyboard implements HasAccoun
 	private MergeRecyclerAdapter adapter=new MergeRecyclerAdapter();
 	private String domain;
 	private String accountID;
-	private Map<String, Integer> recentEmojis = AccountSessionManager.get(accountID).getLocalPreferences().recentEmojis;
+	private Map<String, Integer> recentEmojis;
 
 	private int spanCount=6;
 	private Listener listener;
@@ -90,6 +90,7 @@ public class CustomEmojiPopupKeyboard extends PopupKeyboard implements HasAccoun
 		this.domain=domain;
 		this.accountID=accountID;
 		this.forReaction=forReaction;
+		recentEmojis = AccountSessionManager.get(accountID).getLocalPreferences().recentEmojis;
 	}
 
 	@Override
diff --git a/mastodon/src/main/res/layout/fragment_profile.xml b/mastodon/src/main/res/layout/fragment_profile.xml
index 5440294f5..e90b51f19 100644
--- a/mastodon/src/main/res/layout/fragment_profile.xml
+++ b/mastodon/src/main/res/layout/fragment_profile.xml
@@ -200,6 +200,21 @@
 					android:visibility="gone"
 					app:labelTextColor="@color/m3_outlined_text_field_label">
 
+					<EditText
+						android:id="@+id/name_edit"
+						android:layout_width="match_parent"
+						android:layout_height="56dp"
+						android:layout_marginStart="16dp"
+						android:layout_marginTop="8dp"
+						android:layout_marginEnd="16dp"
+						android:background="@null"
+						android:elevation="0dp"
+						android:hint="@string/display_name"
+						android:inputType="textPersonName|textCapWords"
+						android:padding="16dp"
+						tools:text="Eugen"
+						android:autofillHints="" />
+
 					<FrameLayout
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
@@ -252,21 +267,6 @@
 <!--						android:textAppearance="@style/m3_body_large"-->
 <!--						android:textSize="16sp"-->
 <!--						tools:text="Founder, CEO and lead developer @Mastodon, Germany." />-->
-
-					<EditText
-						android:id="@+id/name_edit"
-						android:layout_width="match_parent"
-						android:layout_height="56dp"
-						android:layout_marginStart="16dp"
-						android:layout_marginTop="8dp"
-						android:layout_marginEnd="16dp"
-						android:background="@null"
-						android:elevation="0dp"
-						android:hint="@string/display_name"
-						android:inputType="textPersonName|textCapWords"
-						android:padding="16dp"
-						tools:text="Eugen"
-						android:autofillHints="" />
 				</org.joinmastodon.android.ui.views.FloatingHintEditTextLayout>
 
 				<org.joinmastodon.android.ui.views.FloatingHintEditTextLayout