Improve validation in UserAction