Fix backend in settings
Merge hotfix in 'token-auth' into staging