fixed first registration page issue
Merge branch 'master' into bugz