diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
index 9c9a1e9a0c5f420f24920e015e7ce2b775faa84a..85ec6ced5e8f0abfa60e52b59d3543b952b8ca84 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
@@ -199,6 +199,12 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
         if (xmppConnectionService == null) {
             return false;
         }
+
+        if (xmppConnectionService.isOnboarding() && xmppConnectionService.getConversations().size() < 2 && mRedirectInProcess.compareAndSet(false, true)) {
+            startCommand(xmppConnectionService.getAccounts().get(0), Jid.of("cheogram.com/CHEOGRAM%jabber:iq:register"), "jabber:iq:register");
+            return mRedirectInProcess.get();
+        }
+
         boolean isConversationsListEmpty = xmppConnectionService.isConversationsListEmpty(ignore);
         if (isConversationsListEmpty && mRedirectInProcess.compareAndSet(false, true)) {
             final Intent intent = SignupUtils.getRedirectionIntent(this);