Reverting to fixed login problem