Added security, server-side validation and make-up