diff --git a/briar-android/res/layout-land/fragment_keyagreement_id.xml b/briar-android/res/layout-land/fragment_keyagreement_id.xml
index 590a76fbf..01351cd1f 100644
--- a/briar-android/res/layout-land/fragment_keyagreement_id.xml
+++ b/briar-android/res/layout-land/fragment_keyagreement_id.xml
@@ -38,7 +38,8 @@
 				style="@style/BriarTextBody"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:text="@string/your_nickname"/>
+				android:text="@string/your_nickname"
+				android:visibility="gone"/>
 
 			<Spinner
 				android:id="@+id/spinner"
@@ -46,7 +47,8 @@
 				android:layout_height="wrap_content"
 				android:layout_marginTop="@dimen/margin_medium"
 				android:background="@drawable/spinner_border"
-				android:spinnerMode="dropdown"/>
+				android:spinnerMode="dropdown"
+				android:visibility="gone"/>
 
 			<TextView
 				android:id="@+id/faceToFaceView"
diff --git a/briar-android/res/layout-land/invitation_bluetooth_start.xml b/briar-android/res/layout-land/invitation_bluetooth_start.xml
index 1449bad7c..977e8dfda 100644
--- a/briar-android/res/layout-land/invitation_bluetooth_start.xml
+++ b/briar-android/res/layout-land/invitation_bluetooth_start.xml
@@ -38,7 +38,8 @@
 				style="@style/BriarTextBody"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:text="@string/your_nickname"/>
+				android:text="@string/your_nickname"
+				android:visibility="gone"/>
 
 			<Spinner
 				android:id="@+id/spinner"
@@ -46,7 +47,8 @@
 				android:layout_height="wrap_content"
 				android:layout_marginTop="@dimen/margin_medium"
 				android:background="@drawable/spinner_border"
-				android:spinnerMode="dropdown"/>
+				android:spinnerMode="dropdown"
+				android:visibility="gone"/>
 
 			<TextView
 				android:id="@+id/faceToFaceView"
diff --git a/briar-android/res/layout/fragment_keyagreement_id.xml b/briar-android/res/layout/fragment_keyagreement_id.xml
index 188536033..a1c0e2130 100644
--- a/briar-android/res/layout/fragment_keyagreement_id.xml
+++ b/briar-android/res/layout/fragment_keyagreement_id.xml
@@ -20,7 +20,8 @@
 			style="@style/BriarTextBody"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:text="@string/your_nickname"/>
+			android:text="@string/your_nickname"
+			android:visibility="gone"/>
 
 		<Spinner
 			android:id="@+id/spinner"
@@ -28,7 +29,8 @@
 			android:layout_height="wrap_content"
 			android:layout_marginTop="@dimen/margin_medium"
 			android:background="@drawable/spinner_border"
-			android:spinnerMode="dropdown"/>
+			android:spinnerMode="dropdown"
+			android:visibility="gone"/>
 
 		<ImageView
 			android:id="@+id/imageView"
diff --git a/briar-android/res/layout/invitation_bluetooth_start.xml b/briar-android/res/layout/invitation_bluetooth_start.xml
index 7c52215a8..ef517bf07 100644
--- a/briar-android/res/layout/invitation_bluetooth_start.xml
+++ b/briar-android/res/layout/invitation_bluetooth_start.xml
@@ -20,7 +20,8 @@
 			style="@style/BriarTextBody"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:text="@string/your_nickname"/>
+			android:text="@string/your_nickname"
+			android:visibility="gone"/>
 
 		<Spinner
 			android:id="@+id/spinner"
@@ -28,7 +29,8 @@
 			android:layout_height="wrap_content"
 			android:background="@drawable/spinner_border"
 			android:layout_marginTop="@dimen/margin_medium"
-			android:spinnerMode="dropdown"/>
+			android:spinnerMode="dropdown"
+			android:visibility="gone"/>
 
 		<ImageView
 			android:id="@+id/imageView"
diff --git a/briar-android/src/org/briarproject/android/keyagreement/ChooseIdentityFragment.java b/briar-android/src/org/briarproject/android/keyagreement/ChooseIdentityFragment.java
index 176a27794..81d284cff 100644
--- a/briar-android/src/org/briarproject/android/keyagreement/ChooseIdentityFragment.java
+++ b/briar-android/src/org/briarproject/android/keyagreement/ChooseIdentityFragment.java
@@ -17,7 +17,6 @@ import org.briarproject.android.ActivityComponent;
 import org.briarproject.android.fragment.BaseFragment;
 import org.briarproject.android.identity.CreateIdentityActivity;
 import org.briarproject.android.identity.LocalAuthorItem;
-import org.briarproject.android.identity.LocalAuthorItemComparator;
 import org.briarproject.android.identity.LocalAuthorSpinnerAdapter;
 import org.briarproject.api.db.DbException;
 import org.briarproject.api.identity.AuthorId;
@@ -146,7 +145,9 @@ public class ChooseIdentityFragment extends BaseFragment
 		listener.runOnUiThread(new Runnable() {
 			@Override
 			public void run() {
-				adapter.clear();
+				setLocalAuthorId(authors.iterator().next().getId());
+				// TODO remove comment below when supporting multiple identities
+/*				adapter.clear();
 				for (LocalAuthor a : authors)
 					adapter.add(new LocalAuthorItem(a));
 				adapter.sort(LocalAuthorItemComparator.INSTANCE);
@@ -161,13 +162,18 @@ public class ChooseIdentityFragment extends BaseFragment
 						return;
 					}
 				}
-			}
+*/			}
 		});
 	}
 
-	private void setLocalAuthorId(AuthorId authorId) {
-		localAuthorId = authorId;
-		button.setEnabled(localAuthorId != null);
+	private void setLocalAuthorId(final AuthorId authorId) {
+		listener.runOnUiThread(new Runnable() {
+			@Override
+			public void run() {
+				localAuthorId = authorId;
+				button.setEnabled(localAuthorId != null);
+			}
+		});
 	}
 
 	@Override