diff --git a/src/api.ts b/src/api.ts
index dde5cec..c7bf475 100644
--- a/src/api.ts
+++ b/src/api.ts
@@ -20,7 +20,7 @@ export const addVisitor = async (visitor: Visitor) => {
   await setDoc(doc(db, "visitors", visitor.name), {
     invitationId: visitor.invitationId,
     allergies: visitor.allergies,
-    services: visitor.services,
+    welcomeDrink: visitor.welcomeDrink,
     preferences: visitor.preferences
   });
 
diff --git a/src/components/RegForm.tsx b/src/components/RegForm.tsx
index 4746937..657c19f 100644
--- a/src/components/RegForm.tsx
+++ b/src/components/RegForm.tsx
@@ -1,5 +1,4 @@
-import { Button, Form, Input, Select } from 'antd';
-import { CloseCircleOutlined } from '@ant-design/icons';
+import { Button, Form, Input, Modal, Select } from 'antd';
 import { useParams } from 'react-router';
 
 import './RegForm.scss';
@@ -40,7 +39,7 @@ const welcomeDrinks = ['alcoholBubbles', 'alcoholFreeBubbles'].map(
     return (
       <Option key={welcomeDrink} value={welcomeDrink}>
         <FormattedMessage
-          id={'registration.form.welcomeDrinks.' + welcomeDrink}
+          id={'registration.form.welcomeDrink.' + welcomeDrink}
         />
       </Option>
     );
@@ -51,156 +50,190 @@ export const RegForm = () => {
   const { id } = useParams<ParamTypes>();
   const intl = useIntl();
   const [visitorCount, setVisitorCount] = useState(0);
+  const [isModalVisible, setIsModalVisible] = useState(false);
 
-  const onFinish = (values: FormValues) => {
+  const onSubmit = (values: FormValues) => {
     values.visitors.map((visitor) => {
       addVisitor({
         ...visitor,
         allergies: visitor.allergies ? arrayToString(visitor.allergies) : '',
-        services: visitor.services ? arrayToString(visitor.services) : '',
         preferences: visitor.preferences ?? '',
+        welcomeDrink: visitor.welcomeDrink ?? '',
         invitationId: (visitor.invitationId = atob(id)),
       });
     });
   };
 
+  const onOk = () => {
+    form.submit();
+
+    setIsModalVisible(false);
+  };
+
+  const onCancel = () => {
+    setIsModalVisible(false);
+  };
+
   const [form] = Form.useForm();
 
   return (
-    <Form
-      form={form}
-      name='registration'
-      onFinish={onFinish}
-      autoComplete='off'
-    >
-      <Form.List name='visitors'>
-        {(fields, { add, remove }) => (
-          <>
-            <div className='visitors'>
-              {fields.map((field) => (
-                <div className='visitor' key={field.key}>
-                  <Form.Item
-                    label={intl.formatMessage({
-                      id: 'registration.form.name',
-                    })}
-                    name={[field.name, 'name']}
-                    fieldKey={[field.fieldKey, 'name']}
-                    rules={[
-                      {
-                        required: true,
-                        message: intl.formatMessage({
-                          id: 'registration.form.name.missing',
-                        }),
-                      },
-                    ]}
-                  >
-                    <Input
-                      placeholder={intl.formatMessage({
-                        id: 'registration.form.name.placeholder',
-                      })}
-                    />
-                  </Form.Item>
-                  <Form.Item
-                    name={[field.name, 'allergies']}
-                    label={intl.formatMessage({
-                      id: 'registration.form.allergies',
-                    })}
-                    fieldKey={[field.fieldKey, 'allergies']}
-                  >
-                    <Select
-                      mode='tags'
-                      placeholder={intl.formatMessage({
-                        id: 'registration.form.allergies.placeholder',
+    <>
+      <Form
+        form={form}
+        name='registration'
+        onFinish={onSubmit}
+        autoComplete='off'
+      >
+        <Form.List name='visitors'>
+          {(fields, { add, remove }) => (
+            <>
+              <div className='visitors'>
+                {fields.map((field) => (
+                  <div className='visitor' key={field.key}>
+                    <Form.Item
+                      label={intl.formatMessage({
+                        id: 'registration.form.name',
                       })}
+                      name={[field.name, 'name']}
+                      fieldKey={[field.fieldKey, 'name']}
+                      rules={[
+                        {
+                          required: true,
+                          message: intl.formatMessage({
+                            id: 'registration.form.name.missing',
+                          }),
+                        },
+                      ]}
                     >
-                      {allergies}
-                    </Select>
-                  </Form.Item>
-                  <Form.Item
-                    name={[field.name, 'preferences']}
-                    label={intl.formatMessage({
-                      id: 'registration.form.preferences',
-                    })}
-                    fieldKey={[field.fieldKey, 'preferences']}
-                  >
-                    <Select defaultValue='everything'>{preferences}</Select>
-                  </Form.Item>
-                  <Form.Item
-                    name={[field.name, 'welcomeDrinks']}
-                    label={intl.formatMessage({
-                      id: 'registration.form.welcomeDrinks',
-                    })}
-                    rules={[
-                      {
-                        required: true,
-                        message: intl.formatMessage({
-                          id: 'registration.form.welcomeDrinks.missing',
-                        }),
-                      },
-                    ]}
-                    fieldKey={[field.fieldKey, 'preferences']}
-                  >
-                    <Select
-                      placeholder={intl.formatMessage({
-                        id: 'registration.form.welcomeDrinks.placeholder',
+                      <Input
+                        placeholder={intl.formatMessage({
+                          id: 'registration.form.name.placeholder',
+                        })}
+                      />
+                    </Form.Item>
+                    <Form.Item
+                      name={[field.name, 'allergies']}
+                      label={intl.formatMessage({
+                        id: 'registration.form.allergies',
                       })}
+                      fieldKey={[field.fieldKey, 'allergies']}
                     >
-                      {welcomeDrinks}
-                    </Select>
-                  </Form.Item>
-                  <Button
-                    danger
-                    onClick={() => {
-                      remove(field.name);
-                      setVisitorCount(visitorCount - 1);
-                    }}
-                    shape='round'
-                    size='large'
-                  >
-                    <FormattedMessage id='registration.form.remove' />
-                  </Button>
-                </div>
-              ))}
-            </div>
-            <Form.Item>
-              <Button
-                className='addVisitorButton'
-                size='large'
-                onClick={() => {
-                  add();
-                  setVisitorCount(visitorCount + 1);
-                }}
-                shape='round'
-              >
-                <FormattedMessage id='registration.addVisitor' />
-              </Button>
-            </Form.Item>
-          </>
+                      <Select
+                        mode='tags'
+                        placeholder={intl.formatMessage({
+                          id: 'registration.form.allergies.placeholder',
+                        })}
+                      >
+                        {allergies}
+                      </Select>
+                    </Form.Item>
+                    <Form.Item
+                      name={[field.name, 'preferences']}
+                      label={intl.formatMessage({
+                        id: 'registration.form.preferences',
+                      })}
+                      fieldKey={[field.fieldKey, 'preferences']}
+                    >
+                      <Select defaultValue='everything'>{preferences}</Select>
+                    </Form.Item>
+                    <Form.Item
+                      name={[field.name, 'welcomeDrink']}
+                      label={intl.formatMessage({
+                        id: 'registration.form.welcomeDrink',
+                      })}
+                      rules={[
+                        {
+                          required: true,
+                          message: intl.formatMessage({
+                            id: 'registration.form.welcomeDrink.missing',
+                          }),
+                        },
+                      ]}
+                      fieldKey={[field.fieldKey, 'welcomeDrink']}
+                    >
+                      <Select
+                        placeholder={intl.formatMessage({
+                          id: 'registration.form.welcomeDrink.placeholder',
+                        })}
+                      >
+                        {welcomeDrinks}
+                      </Select>
+                    </Form.Item>
+                    <Button
+                      danger
+                      onClick={() => {
+                        remove(field.name);
+                        setVisitorCount(visitorCount - 1);
+                      }}
+                      shape='round'
+                      size='large'
+                    >
+                      <FormattedMessage id='registration.form.remove' />
+                    </Button>
+                  </div>
+                ))}
+              </div>
+              <Form.Item>
+                <Button
+                  className='addVisitorButton'
+                  size='large'
+                  onClick={() => {
+                    add();
+                    setVisitorCount(visitorCount + 1);
+                  }}
+                  shape='round'
+                >
+                  <FormattedMessage id='registration.addVisitor' />
+                </Button>
+              </Form.Item>
+            </>
+          )}
+        </Form.List>
+        {visitorCount == 0 ? (
+          <Form.Item>
+            <Button
+              className='submitButton'
+              type='dashed'
+              htmlType='submit'
+              shape='round'
+            >
+              <FormattedMessage id='registration.form.decline' />
+            </Button>
+          </Form.Item>
+        ) : (
+          <Form.Item>
+            <Button
+              className='submitButton'
+              onClick={(e) => setIsModalVisible(true)}
+              size='large'
+              shape='round'
+            >
+              <FormattedMessage id='registration.form.submit' />
+            </Button>
+          </Form.Item>
         )}
-      </Form.List>
-      {visitorCount == 0 ? (
-        <Form.Item>
-          <Button
-            className='submitButton'
-            type='dashed'
-            htmlType='submit'
-            shape='round'
-          >
-            <FormattedMessage id='registration.form.decline' />
-          </Button>
-        </Form.Item>
-      ) : (
-        <Form.Item>
-          <Button
-            className='submitButton'
-            htmlType='submit'
-            size='large'
-            shape='round'
-          >
-            <FormattedMessage id='registration.form.submit' />
-          </Button>
-        </Form.Item>
-      )}
-    </Form>
+      </Form>
+      <Modal
+        title={intl.formatMessage(
+          {
+            id: 'registration.form.submitModal.title',
+          },
+          { visitorCount: visitorCount }
+        )}
+        visible={isModalVisible}
+        onOk={onOk}
+        onCancel={onCancel}
+        okText={intl.formatMessage({
+          id: 'registration.form.submitModal.save',
+        })}
+        cancelText={intl.formatMessage({
+          id: 'registration.form.submitModal.back',
+        })}
+      >
+        <p>
+          <FormattedMessage id='registration.form.submitModal.description' />
+        </p>
+      </Modal>
+    </>
   );
 };
diff --git a/src/constants/localization/registration/en.ts b/src/constants/localization/registration/en.ts
index 3aa288e..f5c9473 100644
--- a/src/constants/localization/registration/en.ts
+++ b/src/constants/localization/registration/en.ts
@@ -28,9 +28,14 @@ export const registration: Record<string, string> = {
     "registration.form.preferences.vegan": "Vegan",
     "registration.form.preferences.vegetarian": "Vegetarian",
     
-    "registration.form.welcomeDrinks": "Welcome drink",
-    "registration.form.welcomeDrinks.placeholder": "What fancy you?",
-    "registration.form.welcomeDrinks.missing": "Missing welcome drink",
-    "registration.form.welcomeDrinks.alcoholBubbles": "Alcohol bubbles",
-    "registration.form.welcomeDrinks.alcoholFreeBubbles": "Alcohol-free bubbles"
+    "registration.form.welcomeDrink": "Welcome drink",
+    "registration.form.welcomeDrink.placeholder": "What fancy you?",
+    "registration.form.welcomeDrink.missing": "Missing welcome drink",
+    "registration.form.welcomeDrink.alcoholBubbles": "Alcohol bubbles",
+    "registration.form.welcomeDrink.alcoholFreeBubbles": "Alcohol-free bubbles",
+    
+    "registration.form.submitModal.title": "You want to add {visitorCount} visitors?",
+    "registration.form.submitModal.description": "The link will not work after the submit.",
+    "registration.form.submitModal.save": "Yes, please",
+    "registration.form.submitModal.back": "No, something is missing...",
 }
\ No newline at end of file
diff --git a/src/constants/localization/registration/fi.ts b/src/constants/localization/registration/fi.ts
index cf48688..695ffb3 100644
--- a/src/constants/localization/registration/fi.ts
+++ b/src/constants/localization/registration/fi.ts
@@ -15,7 +15,7 @@ export const registration: Record<string, string> = {
     "registration.form.name": "Nimi",
     "registration.form.name.placeholder": "Koko tai lempinimi",
     "registration.form.name.missing": "Nimi puuttuu",
-    
+
     "registration.form.allergies": "Ruoka-allergiat (valitse tai kirjoita)",
     "registration.form.allergies.placeholder": "Kaikki käy",
     "registration.form.allergies.lactose": "Laktoosi",
@@ -28,9 +28,14 @@ export const registration: Record<string, string> = {
     "registration.form.preferences.vegan": "Vegaaninen",
     "registration.form.preferences.vegetarian": "Kasvis",
     
-    "registration.form.welcomeDrinks": "Tervetuliasmalja",
-    "registration.form.welcomeDrinks.placeholder": "Mitä saisi olla?",
-    "registration.form.welcomeDrinks.missing": "Tervetulias malja puuttuu",
-    "registration.form.welcomeDrinks.alcoholBubbles": "Holillista kuplivaa",
-    "registration.form.welcomeDrinks.alcoholFreeBubbles": "Holitonta kuplivaa"
+    "registration.form.welcomeDrink": "Tervetuliasmalja",
+    "registration.form.welcomeDrink.placeholder": "Mitä saisi olla?",
+    "registration.form.welcomeDrink.missing": "Tervetulias malja puuttuu",
+    "registration.form.welcomeDrink.alcoholBubbles": "Holillista kuplivaa",
+    "registration.form.welcomeDrink.alcoholFreeBubbles": "Holitonta kuplivaa",
+    
+    "registration.form.submitModal.title": "Lisätään siis {visitorCount} vierasta listalle?",
+    "registration.form.submitModal.description": "Tämä linkki lakkaa toimimasta tallennuksen jälkeen.",
+    "registration.form.submitModal.save": "Tallenna",
+    "registration.form.submitModal.back": "Takaisin",
 }
\ No newline at end of file
diff --git a/src/model/visitor.ts b/src/model/visitor.ts
index ea3e4ac..26ff71f 100644
--- a/src/model/visitor.ts
+++ b/src/model/visitor.ts
@@ -2,6 +2,6 @@ export type Visitor = {
     name: string;
     invitationId: string;
     allergies: any;
-    services: any;
+    welcomeDrink: any;
     preferences: string;
 }
\ No newline at end of file