Fix up login process