Replace mode; restore functionality; small bug fix on form validation
Custom user model