Login refactor

Merged Bruno Boiget requested to merge login_refactor into dev

Merge request reports