Better login

Will not compile yet