fixing registration restrictions
fixing registrations validation stuff
Merge remote-tracking branch 'origin/master'
commiting to be able to merge