Update user model and form validation code to sync with Philipp's latest changes