2nd step after login fix