Fixing missing email scope and some renaming
Refactoring authentication into a separate viewmodel