diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactsView.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactsView.kt
index 603c96732..4eadb7e97 100644
--- a/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactsView.kt
+++ b/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactsView.kt
@@ -83,8 +83,7 @@ class ContactsView(private val bundle: Bundle? = null) : BaseView() {
         val view = super.onCreateView(inflater, container)
 
         // todo - change empty state magic
-        participantsAdapter = Adapter.builder(this)
-                .addSource(FixedListSource(listOf(Pair(context.getString(R.string.nc_new_group), R.drawable.ic_people_group_white_24px)), ParticipantElementType.PARTICIPANT_NEW_GROUP.ordinal))
+        val participantsAdapterBuilder = Adapter.builder(this)
                 //.addSource(FixedListSource(listOf(Pair(context.getString(R.string.nc_join_via_link), R.drawable.ic_link_white_24px)), ParticipantElementType.PARTICIPANT_JOIN_VIA_LINK.ordinal))
                 .addSource(ContactsViewSource(data = viewModel.contactsLiveData, elementType = ParticipantElementType.PARTICIPANT.ordinal))
                 .addSource(ContactsHeaderSource(activity as Context, ParticipantElementType.PARTICIPANT_HEADER.ordinal))
@@ -97,7 +96,12 @@ class ContactsView(private val bundle: Bundle? = null) : BaseView() {
                     view.messageStateImageView.setImageDrawable((activity as Context).getDrawable(R.drawable.ic_announcement_white_24dp))
                 })
                 .setAutoScrollMode(Adapter.AUTOSCROLL_POSITION_0, true)
-                .into(view.recyclerView)
+
+        if (!hasToken) {
+            participantsAdapterBuilder.addSource(FixedListSource(listOf(Pair(context.getString(R.string.nc_new_group), R.drawable.ic_people_group_white_24px)), ParticipantElementType.PARTICIPANT_NEW_GROUP.ordinal))
+        }
+
+        participantsAdapter = participantsAdapterBuilder.into(view.selectedParticipantsRecyclerView)
 
         selectedParticipantsAdapter = Adapter.builder(this)
                 .addSource(ContactsViewSource(data = viewModel.selectedParticipantsLiveData, elementType = ParticipantElementType.PARTICIPANT_SELECTED.ordinal, loadingIndicatorsEnabled = false, errorIndicatorEnabled = false, emptyIndicatorEnabled = false))
diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt
index 282b60c80..b24d6b7e4 100644
--- a/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt
+++ b/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt
@@ -227,7 +227,6 @@ class ConversationsListView : BaseView() {
     }
 
     private fun openNewConversationScreen() {
-        val bundle = Bundle()
         router.pushController(
                 RouterTransaction.with(ContactsView())
                         .pushChangeHandler(HorizontalChangeHandler())
@@ -285,10 +284,7 @@ class ConversationsListView : BaseView() {
     }
 
     override fun onFloatingActionButtonClick() {
-        router?.pushController(
-                RouterTransaction.with(ContactsView())
-                        .pushChangeHandler(HorizontalChangeHandler())
-                        .popChangeHandler(HorizontalChangeHandler()))
+        openNewConversationScreen()
     }
 
     override fun getAppBarLayoutType(): AppBarLayoutType {