diff --git a/0001-Fix-for-dont-expire-password-option-and-join.patch b/0001-Fix-for-dont-expire-password-option-and-join.patch
new file mode 100644
index 0000000..92c22f4
--- /dev/null
+++ b/0001-Fix-for-dont-expire-password-option-and-join.patch
@@ -0,0 +1,27 @@
+From 0d8482d4ed83677424f6c9428672d225bfdfe4d9 Mon Sep 17 00:00:00 2001
+From: Sumit Bose <sbose@redhat.com>
+Date: Thu, 3 Jun 2021 15:03:20 +0200
+Subject: [PATCH] Fix for dont-expire-password option and join
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1769644
+---
+ library/adenroll.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/library/adenroll.c b/library/adenroll.c
+index 7653f89..f00d179 100644
+--- a/library/adenroll.c
++++ b/library/adenroll.c
+@@ -859,7 +859,8 @@ create_computer_account (adcli_enroll *enroll,
+ 		uac |= UAC_TRUSTED_FOR_DELEGATION;
+ 	}
+ 
+-	if (!adcli_enroll_get_dont_expire_password (enroll)) {
++	if (enroll->dont_expire_password_explicit
++		       && !adcli_enroll_get_dont_expire_password (enroll)) {
+ 		uac &= ~(UAC_DONT_EXPIRE_PASSWORD);
+ 	}
+ 
+-- 
+2.31.1
+
diff --git a/adcli.spec b/adcli.spec
index 66fa6c2..a95ca2b 100644
--- a/adcli.spec
+++ b/adcli.spec
@@ -1,6 +1,6 @@
 Name:    adcli
 Version: 0.9.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Active Directory enrollment
 License: LGPLv2+
 URL:     https://gitlab.freedesktop.org/realmd/adcli
@@ -10,6 +10,7 @@ Patch1: 0001-build-add-with-vendor-error-message-configure-option.patch
 Patch2: 0001-configure-update-some-macros-for-autoconf-2.71.patch
 Patch3: 0001-coverity-add-missing-NULL-checks.patch
 Patch4: 0002-Add-dont-expire-password-option.patch
+Patch5: 0001-Fix-for-dont-expire-password-option-and-join.patch
 
 
 BuildRequires: gcc
@@ -75,6 +76,9 @@ documentation.
 %doc %{_datadir}/doc/adcli/*
 
 %changelog
+* Thu Jun 03 2021 Sumit Bose <sbose@redhat.com> - 0.9.1-6
+- Add fix for dont-expire-password option
+
 * Wed Jun 02 2021 Sumit Bose <sbose@redhat.com> - 0.9.1-5
 - Add dont-expire-password option and coverity fixes