Add more safety around legacy users logging in
Add more safety around legacy users logging in

tklauser/ntppool,tklauser/ntppool,tklauser/ntppool,tklauser/ntppool,punitvara/ntppool,punitvara/ntppool,punitvara/ntppool