diff --git a/bin/easyengine b/bin/easyengine
index 863916d7..425ab1b2 100644
--- a/bin/easyengine
+++ b/bin/easyengine
@@ -689,6 +689,8 @@ elif [ "$EE_FIRST" = "site" ]; then
 
 			# Display Success Message
 			ee_lib_echo_info "Successfully Updated  Website: http://$EE_WWW_DOMAIN"
+		elif [[ "$EE_SECOND" = "update" && "$EE_SITE_CREATE_OPTION" = "--password" ]]; then
+			ee_lib_echo "This option is needed for updating WordPress website password" &> /dev/null
 		else
 			ee_lib_error "Invalid option, exit status = " $?
 		fi
diff --git a/src/modules/site/ee_mod_site_option.sh b/src/modules/site/ee_mod_site_option.sh
index 5bb9a414..924858f1 100644
--- a/src/modules/site/ee_mod_site_option.sh
+++ b/src/modules/site/ee_mod_site_option.sh
@@ -36,7 +36,9 @@ function ee_mod_site_option()
 	fi
 
 	# Kick out for invalid cache option
-	if [[ "$EE_SITE_CREATE_OPTION" != "--html" && "$EE_SITE_CREATE_OPTION" != "--php" && "$EE_SITE_CREATE_OPTION" != "--mysql" && "$EE_SITE_CREATE_OPTION" != "--wp" && "$EE_SITE_CREATE_OPTION" != "--wpsubdir" && "$EE_SITE_CREATE_OPTION" != "--wpsubdomain" ]]; then
+	if [[ "$EE_SECOND" = "update" && "$EE_SITE_CREATE_OPTION" = "--password" ]]; then
+		ee_lib_echo "This option is needed for updating WordPress website password" &> /dev/null
+	elif [[ "$EE_SITE_CREATE_OPTION" != "--html" && "$EE_SITE_CREATE_OPTION" != "--php" && "$EE_SITE_CREATE_OPTION" != "--mysql" && "$EE_SITE_CREATE_OPTION" != "--wp" && "$EE_SITE_CREATE_OPTION" != "--wpsubdir" && "$EE_SITE_CREATE_OPTION" != "--wpsubdomain" ]]; then
 		ee_lib_error "Invalid website type $EE_SITE_CREATE_OPTION, exit status = " $?
 	elif [[ "$EE_SITE_CREATE_OPTION" = "--html" || "$EE_SITE_CREATE_OPTION" = "--php" || "$EE_SITE_CREATE_OPTION" = "--mysql" ]] && [ -n "$EE_SITE_CACHE_OPTION" ]; then
 		ee_lib_error "Invalid cache option $EE_SITE_CACHE_OPTION for $EE_SITE_CREATE_OPTION website, exit status = " $?
diff --git a/src/modules/site/update/ee_mod_site_update_password.sh b/src/modules/site/update/ee_mod_site_update_password.sh
index fc418175..fde5fd04 100644
--- a/src/modules/site/update/ee_mod_site_update_password.sh
+++ b/src/modules/site/update/ee_mod_site_update_password.sh
@@ -16,7 +16,7 @@ ee_mod_site_update_password()
 		# If user enter ? mark then show list of WordPress users
 		if [ "$ee_wp_user" = "?" ]; then
 			ee_lib_echo "List of WordPress users:"
-			wp --allow-root user list --fields=user_login
+			wp --allow-root user list --fields=user_login | grep -v user_login
 			read -p "Provide WordPress user name [admin]: " ee_wp_user
 		fi
 
@@ -35,7 +35,7 @@ ee_mod_site_update_password()
 				ee_lib_error "Password Unchanged. Hint : Your password must be 8 characters long, exit status = " $?
 			fi
 		else
-			ee_lib_error "Invalid WordPress  user $ee_wp_user for $EE_DOMAIN, exit status = " $?
+			ee_lib_error "Invalid WordPress user $ee_wp_user for $EE_DOMAIN, exit status = " $?
 		fi
 	fi
 }