diff --git a/icwmp/Makefile b/icwmp/Makefile
index 106dc4079..9d5447faf 100755
--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.9.3
+PKG_VERSION:=9.9.4
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
diff --git a/icwmp/files/etc/uci-defaults/85-cwmp-set-userid b/icwmp/files/etc/uci-defaults/85-cwmp-set-userid
index ba395ff57..ab97c7e91 100644
--- a/icwmp/files/etc/uci-defaults/85-cwmp-set-userid
+++ b/icwmp/files/etc/uci-defaults/85-cwmp-set-userid
@@ -45,11 +45,11 @@ fi
 default_password="$(get_acs_password)"
 config_get pass cpe passwd ""
 if [ -z "${pass}" ]; then
-	uci -q set cwmp.cpe.passwd="${default_password}"
+	uci -q set cwmp.cpe.passwd="${default_password:-iopsys}"
 fi
 
 config_get pass acs passwd ""
 if [ -z "${pass}" ]; then
-	uci -q set cwmp.acs.passwd="${default_password}"
+	uci -q set cwmp.acs.passwd="${default_password:-iopsys}"
 fi
 # No need for commit here, it is done by uci_apply_defaults().