diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index a87e92e766cdfb99312a562e5c390784a9c69414..adb31217fc7535a46f2b861c1d09f75a3b626830 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -3010,6 +3010,11 @@ public class ConversationFragment extends XmppFragment
         if (message != null) {
             startDownloadable(message);
         }
+        if (activity.xmppConnectionService.isOnboarding() && conversation.getJid().equals(Jid.of("cheogram.com"))) {
+            if (!conversation.switchToSession("jabber:iq:register")) {
+                conversation.startCommand(commandFor(Jid.of("cheogram.com/CHEOGRAM%jabber:iq:register"), "jabber:iq:register"), activity.xmppConnectionService);
+            }
+        }
     }
 
     private Element commandFor(final Jid jid, final String node) {