diff --git a/lib/ui/mobile/settings/submenu/calendar_sync.dart b/lib/ui/mobile/settings/submenu/calendar_sync.dart
index edc0118..682d5e7 100644
--- a/lib/ui/mobile/settings/submenu/calendar_sync.dart
+++ b/lib/ui/mobile/settings/submenu/calendar_sync.dart
@@ -34,14 +34,44 @@ class MenuCalendarSync extends StatelessWidget {
   Widget build(BuildContext context) {
     return PanelButton(
       onPressed: () async {
-        if (!Provider.of<PlusProvider>(context, listen: false)
-            .hasScope(PremiumScopes.calendarSync)) {
-          return PlusLockedFeaturePopup.show(
-              context: context, feature: PremiumFeature.calendarSync);
-        }
+        showDialog(
+          context: context,
+          builder: (context) => AlertDialog(
+            title: const Text("Figyelem!"),
+            content: const Text(
+                "A naptár szinkronizálás csak azután fog működni, hogy a Google elfogadja az OAuth kérelmünket, addig is szíves türelmeteket kérjük! Amint ez megtörténik, értesíteni fogunk titeket Discord-on, valamint alkalmazáson belüli hírekben is."),
+            actions: [
+              TextButton(
+                child: const Text(
+                  "Vissza",
+                  style: TextStyle(fontWeight: FontWeight.w500),
+                ),
+                onPressed: () {
+                  Navigator.of(context).pop();
+                },
+              ),
+              TextButton(
+                child: const Text(
+                  "Tovább",
+                  style: TextStyle(fontWeight: FontWeight.w500),
+                ),
+                onPressed: () {
+                  Navigator.of(context).pop();
 
-        Navigator.of(context, rootNavigator: true).push(CupertinoPageRoute(
-            builder: (context) => const CalendarSyncScreen()));
+                  if (!Provider.of<PlusProvider>(context, listen: false)
+                      .hasScope(PremiumScopes.calendarSync)) {
+                    return PlusLockedFeaturePopup.show(
+                        context: context, feature: PremiumFeature.calendarSync);
+                  }
+
+                  Navigator.of(context, rootNavigator: true).push(
+                      CupertinoPageRoute(
+                          builder: (context) => const CalendarSyncScreen()));
+                },
+              ),
+            ],
+          ),
+        );
       },
       title: Text(
         "calendar_sync".i18n,
diff --git a/lib/ui/mobile/settings/welcome_message.dart b/lib/ui/mobile/settings/welcome_message.dart
index 98188ab..b769236 100644
--- a/lib/ui/mobile/settings/welcome_message.dart
+++ b/lib/ui/mobile/settings/welcome_message.dart
@@ -29,13 +29,6 @@ class WelcomeMessagePanelButton extends StatelessWidget {
 
     return PanelButton(
       onPressed: () {
-        if (!Provider.of<PlusProvider>(context, listen: false)
-            .hasScope(PremiumScopes.welcomeMessage)) {
-          PlusLockedFeaturePopup.show(
-              context: context, feature: PremiumFeature.welcomeMessage);
-          return;
-        }
-
         showDialog(
             context: context,
             builder: (context) => WelcomeMessageEditor(settingsProvider));
@@ -145,6 +138,14 @@ class _WelcomeMessageEditorState extends State<WelcomeMessageEditor> {
                 .replaceFirst('\$s', '%s');
             // .replaceAll('\$s', 's');
 
+            if (!Provider.of<PlusProvider>(context, listen: false)
+                    .hasScope(PremiumScopes.welcomeMessage) &&
+                finalText.replaceAll(' ', '') != '') {
+              PlusLockedFeaturePopup.show(
+                  context: context, feature: PremiumFeature.welcomeMessage);
+              return;
+            }
+
             widget.settingsProvider
                 .update(welcomeMessage: finalText, store: true);
             Navigator.of(context).pop(true);