user module fix
Merge branch 'horse' of https://github.com/drxwat/cms into horse