Fix form validation
Merge branch 'client' into develop
Merge branch 'develop' of https://github.com/Trrnts/Trrnts into develop