[User] Fix bugs and cleanup user admin