diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md
index f3b30351..d1ed6792 100644
--- a/RECIPE-API-CHANGELOG.md
+++ b/RECIPE-API-CHANGELOG.md
@@ -397,3 +397,9 @@ New conversions can be added by defining CONVERSION_CMD_type.
     - the conversions appends its own type, e.g. the output file of a conversion `xz`
       would be ${IMAGE_FULLNAME}.${type}.xz
     - a final chown is appended automatically
+
+### Handling of variables USERS and GROUPS is moved to image post processing
+
+The user and groups defined by the variables `USERS` and `GROUPS`
+was moved from image configuration to image post processing. The users and
+groups are now created after all packages are installed.
diff --git a/meta/classes/image-account-extension.bbclass b/meta/classes/image-account-extension.bbclass
index c9bebe85..c64ba769 100644
--- a/meta/classes/image-account-extension.bbclass
+++ b/meta/classes/image-account-extension.bbclass
@@ -58,9 +58,8 @@ IMAGE_ACCOUNTS_GROUPS =+ "${@gen_accounts_array(d, 'GROUPS', 'GROUP', ['gid', 'f
 
 do_rootfs_install[vardeps] += "${IMAGE_ACCOUNTS_GROUPS} ${IMAGE_ACCOUNTS_USERS}"
 
-ROOTFS_CONFIGURE_COMMAND += "image_configure_accounts"
-image_configure_accounts[weight] = "3"
-image_configure_accounts() {
+ROOTFS_POSTPROCESS_COMMAND += "image_postprocess_accounts"
+image_postprocess_accounts() {
     # Create groups
     # Add space to the end of the list:
     list='${@" ".join(d.getVar('IMAGE_ACCOUNTS_GROUPS', True).split())} '
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index aa6c510c..0da56b7a 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -440,6 +440,15 @@ do_rootfs_quality_check() {
 	        args="${args} ! -path ${ROOTFSDIR}/etc/os-release";;
 	    image_postprocess_machine_id)
 	        args="${args} ! -path ${ROOTFSDIR}/etc/machine-id";;
+	    image_postprocess_accounts)
+	        args="${args} ! -path ${ROOTFSDIR}/etc/passwd \
+                          ! -path ${ROOTFSDIR}/etc/subgid \
+                          ! -path ${ROOTFSDIR}/etc/subuid \
+                          ! -path ${ROOTFSDIR}/etc/shadow- \
+                          ! -path ${ROOTFSDIR}/etc/gshadow \
+                          ! -path ${ROOTFSDIR}/etc/shadow \
+                          ! -path ${ROOTFSDIR}/etc/group"
+            ;;
 	esac
     done
     found=$( sudo find ${ROOTFSDIR} -type f -newer $rootfs_install_stamp $args )