diff --git a/changelogs/fragments/ipsec_auto.yml b/changelogs/fragments/ipsec_auto.yml
new file mode 100644
index 00000000..86299cd9
--- /dev/null
+++ b/changelogs/fragments/ipsec_auto.yml
@@ -0,0 +1,2 @@
+minor_changes:
+  - added ``auto`` choice for ``myid_type`` and ``peerid_type`` (https://github.com/pfsensible/core/issues/145)
diff --git a/plugins/module_utils/ipsec.py b/plugins/module_utils/ipsec.py
index b225dabf..8653af2f 100644
--- a/plugins/module_utils/ipsec.py
+++ b/plugins/module_utils/ipsec.py
@@ -22,9 +22,9 @@
 
     authentication_method=dict(choices=['pre_shared_key', 'rsasig']),
     mode=dict(required=False, choices=['main', 'aggressive']),
-    myid_type=dict(default='myaddress', choices=['myaddress', 'address', 'fqdn', 'user_fqdn', 'asn1dn', 'keyid tag', 'dyn_dns']),
+    myid_type=dict(default='myaddress', choices=['myaddress', 'address', 'fqdn', 'user_fqdn', 'asn1dn', 'keyid tag', 'dyn_dns', 'auto']),
     myid_data=dict(required=False, type='str'),
-    peerid_type=dict(default='peeraddress', choices=['any', 'peeraddress', 'address', 'fqdn', 'user_fqdn', 'asn1dn', 'keyid tag']),
+    peerid_type=dict(default='peeraddress', choices=['any', 'peeraddress', 'address', 'fqdn', 'user_fqdn', 'asn1dn', 'keyid tag', 'auto']),
     peerid_data=dict(required=False, type='str'),
     certificate=dict(required=False, type='str'),
     certificate_authority=dict(required=False, type='str'),
diff --git a/plugins/modules/pfsense_ipsec.py b/plugins/modules/pfsense_ipsec.py
index 0e6156c8..3c16f252 100644
--- a/plugins/modules/pfsense_ipsec.py
+++ b/plugins/modules/pfsense_ipsec.py
@@ -58,7 +58,7 @@
   myid_type:
     description: Local identifier type.
     default: 'myaddress'
-    choices: [ 'myaddress', 'address', 'fqdn', 'user_fqdn', 'asn1dn', 'keyid tag', 'dyn_dns' ]
+    choices: [ 'myaddress', 'address', 'fqdn', 'user_fqdn', 'asn1dn', 'keyid tag', 'dyn_dns', 'auto' ]
     type: str
   myid_data:
     description: Local identifier value.
@@ -67,7 +67,7 @@
   peerid_type:
     description: Remote identifier type.
     default: 'peeraddress'
-    choices: [ 'any', 'peeraddress', 'address', 'fqdn', 'user_fqdn', 'asn1dn', 'keyid tag' ]
+    choices: [ 'any', 'peeraddress', 'address', 'fqdn', 'user_fqdn', 'asn1dn', 'keyid tag', 'auto' ]
     type: str
   peerid_data:
     description: Remote identifier value.