Tightened up login process