Complete some user management parts