Fix up login stuff