Cleaning up the db
Fixing some validation on user