Fixes for users-server