Complete maintenance and fix user list bug