Settings to service WIP | fix login 2