Fix user singleton. Other requests should be fixed now