diff --git a/components/dashboard/src/settings/Notifications.tsx b/components/dashboard/src/settings/Notifications.tsx
index 2db1994e39c754..8b03b5aea7c189 100644
--- a/components/dashboard/src/settings/Notifications.tsx
+++ b/components/dashboard/src/settings/Notifications.tsx
@@ -13,9 +13,32 @@ import settingsMenu from "./settings-menu";
 
 export default function Notifications() {
     const { user, setUser } = useContext(UserContext);
+    const [isOnboardingMail, setOnboardingMail] = useState(!!user?.additionalData?.emailNotificationSettings?.allowsOnboardingMail);
     const [isChangelogMail, setChangelogMail] = useState(!!user?.additionalData?.emailNotificationSettings?.allowsChangelogMail);
     const [isDevXMail, setDevXMail] = useState(!!user?.additionalData?.emailNotificationSettings?.allowsDevXMail);
 
+    const toggleOnboardingMail = async () => {
+        if (user && user.additionalData && user.additionalData.emailNotificationSettings) {
+            const newIsOnboardingMail = !isOnboardingMail;
+            user.additionalData.emailNotificationSettings.allowsOnboardingMail = newIsOnboardingMail;
+            await getGitpodService().server.updateLoggedInUser({
+                additionalData: {
+                    ...user.additionalData,
+                    emailNotificationSettings: {
+                        ...user.additionalData.emailNotificationSettings,
+                        allowsOnboardingMail: newIsOnboardingMail
+                    }
+                }
+            });
+            await getGitpodService().server.trackEvent({
+                event: "notification_change",
+                properties: { "unsubscribed_onboarding": !newIsOnboardingMail }
+            })
+            setUser(user);
+            setOnboardingMail(newIsOnboardingMail);
+        }
+    }
+
     const toggleChangelogMail = async () => {
         if (user && user.additionalData && user.additionalData.emailNotificationSettings) {
             const newIsChangelogMail = !isChangelogMail;
@@ -69,6 +92,11 @@ export default function Notifications() {
                 desc="Receive essential emails about changes to your account"
                 checked={true}
                 disabled={true} />
+            <CheckBox
+                title="Onboarding guide"
+                desc="In the first weeks after you sign up, we'll guide you through the product, so you can get the most out of it"
+                checked={isOnboardingMail}
+                onChange={toggleOnboardingMail} />
             <CheckBox
                 title="Changelog"
                 desc="Be the first to learn about new features and overall product improvements"
diff --git a/components/gitpod-db/src/typeorm/user-db-impl.ts b/components/gitpod-db/src/typeorm/user-db-impl.ts
index 5fbe7357f78e04..699707db706459 100644
--- a/components/gitpod-db/src/typeorm/user-db-impl.ts
+++ b/components/gitpod-db/src/typeorm/user-db-impl.ts
@@ -79,7 +79,7 @@ export class TypeORMUserDBImpl implements UserDB {
             identities: [],
             additionalData: {
                 ideSettings: { defaultIde: 'code' },
-                emailNotificationSettings: { allowsChangelogMail: true, allowsDevXMail: true }
+                emailNotificationSettings: { allowsChangelogMail: true, allowsDevXMail: true, allowsOnboardingMail: true }
             },
         };
         await this.storeUser(user);
diff --git a/components/gitpod-protocol/src/protocol.ts b/components/gitpod-protocol/src/protocol.ts
index ee9c3c2f03294c..1259732cbf070c 100644
--- a/components/gitpod-protocol/src/protocol.ts
+++ b/components/gitpod-protocol/src/protocol.ts
@@ -109,6 +109,7 @@ export interface AdditionalUserData {
 export interface EmailNotificationSettings {
     allowsChangelogMail?: boolean;
     allowsDevXMail?: boolean;
+    allowsOnboardingMail?: boolean;
 }
 
 export type IDESettings = {