diff --git a/ublinux/rc.preinit/10-accounts b/ublinux/rc.preinit/10-accounts
index 907783b..dac2b03 100755
--- a/ublinux/rc.preinit/10-accounts
+++ b/ublinux/rc.preinit/10-accounts
@@ -102,7 +102,7 @@ create_home(){
 }
 
 # Задаём пароль root пользователю
-exec_defaultrootpasswd(){
+exec_00_defaultrootpasswd(){
 #echo "exec_02_defaultrootpasswd"
     [[ $1 == @("set="|"set+="|"set++="|"set-="|"set--="|"remove") ]] && COMMAND=$1 && shift
     [[ -n ${COMMAND} ]] || COMMAND="set="
@@ -131,7 +131,7 @@ exec_defaultrootpasswd(){
 }
 
 # Задаём пароль по умолчанию пользователю
-exec_defaultpasswd(){
+exec_00_defaultpasswd(){
 #echo "exec_02_defaultrootpasswd"
     [[ $1 == @("set="|"set+="|"set++="|"set-="|"set--="|"remove") ]] && COMMAND=$1 && shift
     [[ -n ${COMMAND} ]] || COMMAND="set="
@@ -342,7 +342,7 @@ exec_03_useradd(){
     while IFS=':' read -u3 SELECT_USERNAME SELECT_UID SELECT_GROUP SELECT_EXTRAGROUP SELECT_PASSWORD NULL; do
 	[[ ${SELECT_USERNAME} != "" ]] && USERADD[${SELECT_USERNAME}]=":${SELECT_UID}:${SELECT_GROUP}:${SELECT_EXTRAGROUP}:x:${SELECT_PASSWORD}"
     done 3< <(tr ';' '\n' <<< $(cmdline_value useradd))
-    if [[ ${COMMAND} == @("set="|"set+="|"set++=") ]] && [[ ${#USERADD[@]} != 0 ]]; then
+    if [[ ${COMMAND} == @("set="|"set+="|"set++=") ]]; then
 	[[ ${#USERADD[@]} == 0 ]] && USERADD[${DEFAULTUSER}]="Administrator:${ADMUID}:x:x:x:${DEFAULTPASSWD}"
 	exec_05_groupadd
 	[[ ${NOSECUREROOTPASSWD} == ${DEFAULTROOTPASSWD} ]] && ADDADM=yes
@@ -679,13 +679,13 @@ exec_05_groupadd(){
 exec_99_firststart(){
 #echo "exec_99_firststart"
     [[ $1 == @("set="|"set+="|"set++="|"set-="|"set--="|"remove") ]] && COMMAND=$1 && shift
-    [[ -n ${COMMAND} ]] || COMMAND=
+    [[ -n ${COMMAND} ]] || COMMAND="set="
     local PARAM="$@"
     if [[ -n ${PARAM} ]]; then
 	local FIRSTSTART=
 	[[ ${PARAM%%=*} =~ [!\$%\&()*+,/\;\<\=\>?\^\{|\}~] ]] || eval "${PARAM%%=*}=\${PARAM#*=}"
     fi
-    if [[ ${COMMAND} == "" ]]; then
+    if [[ -n ${ROOTFS} ]]; then
 	if grep -q "^root:${DEFAULTROOTPASSWD}:" ${ROOTFS}/etc/shadow \
 	&& grep -q "^$(grep ".*:x:${ADMUID}:" ${ROOTFS}/etc/passwd | cut -d: -f1):${DEFAULTPASSWD}:" ${ROOTFS}/etc/shadow; then
 	    grep -q "^FIRSTSTART$" ${SYSCONF}/config 2>/dev/null || echo "FIRSTSTART=yes" >> ${SYSCONF}/config