Reformatted login/logout/register