Merge pull request #545 from liuchuangww/user

Move custom template file to custom directory
Fix custom register