Update user and auth services with cleaner code