Fix Second LOGIN problem