Security improvement

Improved the security of the form, but a lot more needs to be added.