diff --git a/meta-yadro/meta-nicole/conf/local.conf.sample b/meta-yadro/meta-nicole/conf/local.conf.sample
index 8e426c7..4a91b28 100644
--- a/meta-yadro/meta-nicole/conf/local.conf.sample
+++ b/meta-yadro/meta-nicole/conf/local.conf.sample
@@ -256,3 +256,9 @@
 
 # Set the root password to '0penBmc'
 # Defaults from meta-phosphor/conf/distro/include/phosphor-defaults.inc
+
+# Add default administrative account (login: admin, password: admin)
+DEFAULT_ADMIN_PASSWORD = "'\$6\$Fze0kFe8\$YjEc0mvYcwZvjBtnVWQ4Os4gFMDj.ogBkg2jTSjpOgFQpT33hDitAUheGGJcSZ0PkzRuzOq/xhpJ5bmrFg46R.'"
+EXTRA_USERS_PARAMS:append:pn-obmc-phosphor-image = "\
+  useradd -p ${DEFAULT_ADMIN_PASSWORD} -g users -G priv-admin,ipmi -N admin; \
+"
diff --git a/meta-yadro/meta-nicole/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/images/obmc-phosphor-image.bbappend
index a18048d..2055e99 100644
--- a/meta-yadro/meta-nicole/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ b/meta-yadro/meta-nicole/recipes-phosphor/images/obmc-phosphor-image.bbappend
@@ -1,5 +1,4 @@
 OBMC_IMAGE_EXTRA_INSTALL:append = " \
-    admin-account \
     first-boot-set-hostname \
     mboxd \
     obmc-yadro-cli \
diff --git a/meta-yadro/meta-nicole/recipes-phosphor/users/admin-account.bb b/meta-yadro/meta-nicole/recipes-phosphor/users/admin-account.bb
deleted file mode 100644
index 1bb0ae1..0000000
--- a/meta-yadro/meta-nicole/recipes-phosphor/users/admin-account.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-SUMMARY = "Default administrative account"
-DESCRIPTION = "Creating default account for system administrator"
-PR = "r1"
-
-inherit useradd
-
-# License info
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-
-# Dependencies
-RDEPENDS:${PN} = "\
-    sudo \
-    phosphor-ipmi-host \
-    phosphor-user-manager \
-"
-
-# Groups
-GROUP_ADMIN = "priv-admin"
-GROUP_OPERATOR = "priv-operator"
-GROUP_USER = "priv-user"
-GROUP_IPMI = "ipmi"
-
-# Default administrative account (login: admin, password: admin)
-ADMIN_LOGIN = "admin"
-ADMIN_PASSW = "\$1\$Fze0kFe8\$sylEANC01t.osF8OewyB/1"
-USERADD_PACKAGES = "${PN}"
-USERADD_PARAM:${PN} = "--groups ${GROUP_ADMIN},${GROUP_IPMI} \
-                       --password '${ADMIN_PASSW}' \
-                       ${ADMIN_LOGIN}"
-
-# We don't have package body
-ALLOW_EMPTY:${PN} = "1"
-
-# Workaround for meta-phosphor/classes/phosphor-rootfs-postcommands.bbclass.
-# The bb-script cannot add root to non-empty groups (invalid sed command).
-GROUPMEMS_PARAM:${PN} = "-a root -g ${GROUP_ADMIN}; \
-                         -a root -g ${GROUP_IPMI}"