Hotfixes production take 2

Rebased sin los errores de fin-de-línea.
Perceived complexity for users_as_json is too high. [13/7]