S1 cf4, cf5 user registration

https://vinsol.atlassian.net/browse/CF-4
https://vinsol.atlassian.net/browse/CF-5
indentation issues