diff --git a/js/delivery_receipts.js b/js/delivery_receipts.js
index a58f68636..fe0455bd3 100644
--- a/js/delivery_receipts.js
+++ b/js/delivery_receipts.js
@@ -105,7 +105,7 @@
           .getConversationController()
           .get(message.get('conversationId'));
         if (conversation) {
-          conversation.updateLastMessage()
+          conversation.updateLastMessage();
         }
 
         this.remove(receipt);
diff --git a/js/read_receipts.js b/js/read_receipts.js
index 00af1ecb6..fe5e8adcb 100644
--- a/js/read_receipts.js
+++ b/js/read_receipts.js
@@ -106,7 +106,7 @@
           .getConversationController()
           .get(message.get('conversationId'));
         if (conversation) {
-          conversation.updateLastMessage()
+          conversation.updateLastMessage();
         }
 
         this.remove(receipt);
diff --git a/stylesheets/_session_signin.scss b/stylesheets/_session_signin.scss
index c4bb55f9f..58d734d59 100644
--- a/stylesheets/_session_signin.scss
+++ b/stylesheets/_session_signin.scss
@@ -94,6 +94,10 @@
           margin-bottom: 5px;
         }
       }
+
+      & .or {
+        text-align: center;
+      }
     }
 
     &__sections {
diff --git a/ts/components/session/registration/SignInTab.tsx b/ts/components/session/registration/SignInTab.tsx
index 3dc9febb3..a226f5d5f 100644
--- a/ts/components/session/registration/SignInTab.tsx
+++ b/ts/components/session/registration/SignInTab.tsx
@@ -90,7 +90,9 @@ const SignInButtons = (props: {
       <RestoreUsingRecoveryPhraseButton
         onRecoveryButtonClicked={props.onRecoveryButtonClicked}
       />
+      <div className="spacer-lg" />
       <div className="or">{window.i18n('or')}</div>
+      <div className="spacer-lg" />
       <LinkDeviceButton
         onLinkDeviceButtonClicked={props.onLinkDeviceButtonClicked}
       />
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index 8f1c187c4..06164fa60 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -1,5 +1,9 @@
 import _ from 'lodash';
-import { getItemById, hasSyncedInitialConfigurationItem } from '../data/data';
+import {
+  createOrUpdateItem,
+  getItemById,
+  hasSyncedInitialConfigurationItem,
+} from '../data/data';
 import { SignalService } from '../protobuf';
 import { ConversationController } from '../session/conversations';
 import { OpenGroup } from '../session/types';
@@ -56,12 +60,10 @@ async function handleGroupsAndContactsFromConfigMessage(
     );
     return;
   }
-  if (didWeHandleAConfigurationMessageAlready) {
-    window?.log?.warn(
-      'Dropping configuration change as we already handled one... '
-    );
-    return;
-  }
+  await createOrUpdateItem({
+    id: 'hasSyncedInitialConfigurationItem',
+    value: true,
+  });
 
   const numberClosedGroup = configMessage.closedGroups?.length || 0;