diff --git a/scripts/qrcode.py b/scripts/qrcode.py
index e5b51b9..dfaa429 100644
--- a/scripts/qrcode.py
+++ b/scripts/qrcode.py
@@ -20,9 +20,9 @@ def generate(selected_tab, keys, *values):
             data = helpers.make_wifi_data(ssid=args["wifi_ssid"], password=args["wifi_password"], security=args["wifi_security"], hidden=args["wifi_hidden"])
         elif selected_tab == "tab_vcard":
             name = f'{args["vcard_name_last"]};{args["vcard_name_first"]};{args["vcard_name_middle"]}'
-            data = helpers.make_vcard_data(name, displayname=args["vcard_displayname"], nickname=args["vcard_nickname"], street=args["vcard_address"], city=args["vcard_city"], region=args["vcard_state"], zipcode=args["vcard_zipcode"], country=args["vcard_country"], birthday=args["vcard_birthday"], email=args["vcard_email"], phone=args["vcard_phone"], fax=args["vcard_fax"], memo=args["vcard_memo"], org=args["vcard_organization"], title=args["vcard_title"], cellphone=args["vcard_phone_mobile"], url=args["vcard_url"])
+            data = helpers.make_vcard_data(name, displayname=args["vcard_displayname"], nickname=args["vcard_nickname"], street=args["vcard_address"], city=args["vcard_city"], region=args["vcard_state"], zipcode=args["vcard_zipcode"], country=args["vcard_country"], birthday=args["vcard_birthday"], email=args["vcard_email"] or None, phone=args["vcard_phone"] or None, fax=args["vcard_fax"] or None, memo=args["vcard_memo"], org=args["vcard_organization"], title=args["vcard_title"] or None, cellphone=args["vcard_phone_mobile"] or None, url=args["vcard_url"] or None)
         elif selected_tab == "tab_mecard":
-            data = helpers.make_mecard_data(name=args["mecard_name"], reading=args["mecard_kananame"], nickname=args["mecard_nickname"], houseno=args["mecard_address"], city=args["mecard_city"], prefecture=args["mecard_state"], zipcode=args["mecard_zipcode"], country=args["mecard_country"], birthday=args["mecard_birthday"], email=args["mecard_email"], phone=args["mecard_phone"], memo=args["mecard_memo"])
+            data = helpers.make_mecard_data(name=args["mecard_name"], reading=args["mecard_kananame"], nickname=args["mecard_nickname"], houseno=args["mecard_address"], city=args["mecard_city"], prefecture=args["mecard_state"], zipcode=args["mecard_zipcode"], country=args["mecard_country"], birthday=args["mecard_birthday"], email=args["mecard_email"] or None, phone=args["mecard_phone"] or None, memo=args["mecard_memo"])
         elif selected_tab == "tab_sms":
             data = f'smsto:{args["sms_number"]}:{args["sms_message"]}'
         elif selected_tab == "tab_email":