diff --git a/pykeepass/entry.py b/pykeepass/entry.py
index 3ef7e4ed..6ad3919a 100644
--- a/pykeepass/entry.py
+++ b/pykeepass/entry.py
@@ -41,9 +41,11 @@ def __init__(self, title=None, username=None, password=None, url=None,
             )
             self._element.append(E.String(E.Key('Title'), E.Value(title)))
             self._element.append(E.String(E.Key('UserName'), E.Value(username)))
-            self._element.append(
-                E.String(E.Key('Password'), E.Value(password, Protected="True"))
-            )
+            # Allowing password to be None
+            if password is not None:
+                self._element.append(
+                    E.String(E.Key('Password'), E.Value(password, Protected="True"))
+                )
             if url:
                 self._element.append(E.String(E.Key('URL'), E.Value(url)))
             if notes:
diff --git a/pykeepass/pykeepass.py b/pykeepass/pykeepass.py
index ec8b506d..fd186099 100644
--- a/pykeepass/pykeepass.py
+++ b/pykeepass/pykeepass.py
@@ -648,7 +648,7 @@ def find_entries(self, recursive=True, path=None, group=None, **kwargs):
 
 
     def add_entry(self, destination_group, title, username,
-                  password, url=None, notes=None, expiry_time=None,
+                  password=None, url=None, notes=None, expiry_time=None,
                   tags=None, otp=None, icon=None, force_creation=False):
 
         """Create a new entry