Fix user management
Merge branch 'master' of github.com:/Elizacat/enya